[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3474] New - making a new subdir, moving files into it and
From:       Johan Corveleyn <johan.corveleyn () uzleuven ! be>
Date:       2009-08-28 15:53:39
Message-ID: iz3474 () subversion ! tigris ! org
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3474
                 Issue #|3474
                 Summary|making a new subdir, moving files into it and then ren
                        |aming the subdir, breaks history of the moved files
               Component|subversion
                 Version|---
                Platform|All
                     URL|http://subversion.tigris.org/ds/viewMessage.do?dsForum
                        |Id=1065&dsMessageId=2387209
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|unknown
             Assigned to|issues@subversion
             Reported by|johanco






------- Additional comments from johanco@tigris.org Fri Aug 28 08:53:38 -0700 2009 -------
Discussion on users-list:
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2387209

Just filing this so it isn't forgotten (and it is a genuine issue for <= 1.6). I
hope this will be resolved implicitly thanks to more robustness in wc-ng (to be
verified). In that case it probably doesn't need a specific fix for 1.6.

Here goes (assuming we're in a working copy with a versioned file a.txt):
$ svn mkdir subdir
A subdir

$ svn mv a.txt subdir/
A subdir\a.txt
D a.txt

$ svn st
A subdir
A + subdir\a.txt
D a.txt
# -> All still ok

$ svn mv subdir/ subdir2
A subdir2
A subdir2\a.txt
D subdir

$ svn st
A subdir2
A subdir2\a.txt
D a.txt
# -> subdir2\a.txt no longer has a historic relationship with a.txt.
# If we commit this, we effectively break the line of history of a.txt

Other variations of this scenario seems to work out better:
- If subdir already exists, the move of a file into it followed by the rename of
subdir is no problem.

As noted in the mailthread: this kind of scenario is quite common in a
development environment with a lot of refactoring...

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2388313

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]