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

List:       mercurial
Subject:    Re: Convert svn to hg - splicing with moved/renamed files
From:       Stanimir Stamenkov <s7an10 () netscape ! net>
Date:       2010-12-26 22:41:45
Message-ID: 4D17C4A9.3020104 () netscape ! net
[Download RAW message or body]

Sat, 25 Dec 2010 18:25:47 +0200, /Stanimir Stamenkov/:

> 4. The revision which merges the branch changes into the main line 
> seems to properly remove the original file location and add the 
> new (moved) one, but it is not recorded as rename resulting in 
> completely wrong file annotations (visible with all examples).

What I suspect is happening is the convert doesn't properly 
recognize the source of move/rename when it is happening on a 
different branch, probably because the base path is different:

trunk/ vs. branches/<branch_name>/

I guess the same problem is with the other splices I've described. 
Here's the svn log for some clue:

------------------------------------------------------------------------
r13 | peter | 2010-12-25 02:13:18 +0200 (съб, 25 дек 2010) | 2 lines
Changed paths:
    M /trunk
    D /trunk/README
    A /trunk/doc (from /branches/feature/doc:12)
    M /trunk/doc/README
------------------------------------------------------------------------
r12 | stanio | 2010-12-25 02:04:45 +0200 (съб, 25 дек 2010) | 2 lines
Changed paths:
    M /trunk/README
------------------------------------------------------------------------

-- 
Stanimir
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial

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