Success! Looks like we've fixed this one. According to our records the fix was applied for DSGNR-3514 in a recent build.
  1. #1
    Sencha Premium Member intellix's Avatar
    Join Date
    Mar 2012
    Location
    UK + Malta
    Posts
    263
    Vote Rating
    18
    intellix will become famous soon enough

      0  

    Default Architect 2.2 won't be friends with SVN

    Architect 2.2 won't be friends with SVN


    Having issues with architect corrupting my SVN files.

    Everytime I save my architect folder and do an svn commit it compains about something along the lines of:

    Code:
    Transmitting file data ...svn: Commit failed (details follow):
    svn: Can't open file '/Users/dominicwatson/Sites/Hummingbird/app/model/.svn/tmp/text-base/HomeIcon.js.svn-base': No such file or directory
    idkca:Hummingbird dominicwatson$ svn up
    svn: Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try again
    svn: Can't open file 'app/.svn/tmp/entries': No such file or directory
    I then do an svn cleanup and get a screen full of warnings inside Architect, which I assume is it, listening to changes outside of architect.

    http://imgur.com/Y3VOnXK

  2. #2
    Sencha - Architect Dev Team aconran's Avatar
    Join Date
    Mar 2007
    Posts
    9,266
    Vote Rating
    121
    aconran is a splendid one to behold aconran is a splendid one to behold aconran is a splendid one to behold aconran is a splendid one to behold aconran is a splendid one to behold aconran is a splendid one to behold aconran is a splendid one to behold

      0  

    Default


    We'll investigate SVN usage and should be able to fix these issues.
    Aaron Conran
    @aconran
    Sencha Architect Development Team

  3. #3
    Sencha - Architect Dev Team Phil.Strong's Avatar
    Join Date
    Mar 2007
    Location
    Olney, MD
    Posts
    1,907
    Vote Rating
    62
    Phil.Strong is just really nice Phil.Strong is just really nice Phil.Strong is just really nice Phil.Strong is just really nice

      0  

    Default


    Thanks for the report! I have opened a bug in our bug tracker.

  4. #4
    Sencha Premium Member
    Join Date
    Oct 2009
    Posts
    104
    Vote Rating
    3
    gatherworks is on a distinguished road

      0  

    Default


    Same here. Architect 2.2 is useless to us until this is fixed. Please prioritize! We have waited for a long time to get the fixes in 2.2 and now we cannot use it.

  5. #5
    Sencha - Architect Dev Team Phil.Strong's Avatar
    Join Date
    Mar 2007
    Location
    Olney, MD
    Posts
    1,907
    Vote Rating
    62
    Phil.Strong is just really nice Phil.Strong is just really nice Phil.Strong is just really nice Phil.Strong is just really nice

      0  

    Default


    I'm working on this one now.
    Phil Strong
    @philstrong
    #SenchaArchitect
    Sencha Architect Development Team

  6. #6
    Sencha Premium Member
    Join Date
    Oct 2009
    Posts
    104
    Vote Rating
    3
    gatherworks is on a distinguished road

      1  

    Default


    Much appreciated!! We are super excited to start using it.

    I am sure you will see that Architect steps on some the tmp folders used by svn.

  7. #7
    Sencha User
    Join Date
    Dec 2007
    Posts
    115
    Vote Rating
    12
    corvonero will become famous soon enough

      0  

    Default


    I've been using mercurial with SA 2.x for some months now...
    I have to say that the main problem is not in file appearing or disappearing...
    it's really on the format of the XSD itself that does not allow easy (or automatic) merging...

    Have you experienced that?

    M.

  8. #8
    Sencha - Architect Dev Team Phil.Strong's Avatar
    Join Date
    Mar 2007
    Location
    Olney, MD
    Posts
    1,907
    Vote Rating
    62
    Phil.Strong is just really nice Phil.Strong is just really nice Phil.Strong is just really nice Phil.Strong is just really nice

      0  

    Default


    Any recommendations for a refactor on the format? We're trying to improve merge-ability
    Phil Strong
    @philstrong
    #SenchaArchitect
    Sencha Architect Development Team

  9. #9
    Sencha User
    Join Date
    Dec 2007
    Posts
    115
    Vote Rating
    12
    corvonero will become famous soon enough

      0  

    Default


    The most stupid solution I can come up with, would be changing this:

    PHP Code:
    "8aec6acc-fbb2-4a32-a2fc-3edf28b70706": {
                
    "paths": [
                    
    "metadata/resource/js4"
                
    ],
                
    "className""js4"
            
    }, 
    to this:

    PHP Code:
    "8aec6acc-fbb2-4a32-a2fc-3edf28b70706": { "paths": [ "metadata/resource/js4" ], "className""js4"}, 
    Having single lines instead of a structure will help tools like diff and similar to merge changes...

  10. #10
    Sencha User
    Join Date
    Dec 2007
    Posts
    115
    Vote Rating
    12
    corvonero will become famous soon enough

      0  

    Default


    And something like this might help as well.

    Instead of
    PHP Code:
    "store": [
                
    "b9b34b64-8b91-4ad1-a5a5-f35a1efba5bb",
    ...
    blabla...
                
    "76d2bb69-fb23-43ed-add6-9a196c4e7915"
            
    ], 
    have something like this

    PHP Code:
    "store": [
                
    "b9b34b64-8b91-4ad1-a5a5-f35a1efba5bb",
    ...
    blabla...
                
    "76d2bb69-fb23-43ed-add6-9a196c4e7915"
            
    ], /* END OF STORE */ 
    ... having markers helps mergers