[prev in list] [next in list] [prev in thread] [next in thread]
List: svnmerge
Subject: Re: [Svnmerge] Renames/Moves followed by merge
From: Nico Schellingerhout <nico.schellingerhout () philips ! com>
Date: 2008-07-15 21:52:26
Message-ID: OF48CD10CA.41A2BFCB-ONC1257487.0077EC9B-C1257487.0078285E () philips ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Rohan Joseph wrote:
> Hello All,
>
> As most of you may be aware, svn implements 'renames' as a
> copy followed by a deleted. There is a very well known use scenario
> wherein a merge followed by a rename can completely complicate things.
>
>
> Edit foo.c on branch1
> On branch2, rename foo.c to bar.c
>
> Case I: merge branch1 -> branch2
> svn merge will skip the file, because it can't find it
>
> Case II: merge branch2 -> branch1
> svn merge will delete the 'newer' version of foo.c and add bar.c,
> which has the older text
>
> To the best of my knowledge, svnmerge.py also doesn't help in this
> case. Does anyone have a work around to this?
We are working on a merge helper script for this (and a number of
other use cases).
We will contribute this script once it is sufficiently usable.
- Nico
[Attachment #5 (text/html)]
<html><body>
<p><tt>Rohan Joseph wrote:</tt><br>
<tt><br>
> Hello All,<br>
> <br>
> As most of you may be aware, svn \
implements 'renames' as a<br> > copy followed by a deleted. There is a very well \
known use scenario<br> > wherein a merge followed by a rename can completely \
complicate things.<br> > <br>
> <br>
> Edit foo.c on branch1<br>
> On branch2, rename foo.c to bar.c<br>
> <br>
> Case I: merge branch1 -> branch2<br>
> svn merge will skip the file, because it can't find it<br>
> <br>
> Case II: merge branch2 -> branch1<br>
> svn merge will delete the 'newer' version of foo.c and add bar.c,<br>
> which has the older text<br>
> <br>
> To the best of my knowledge, svnmerge.py also doesn't help in this<br>
> case. Does anyone have a work around to this?<br>
</tt><br>
<tt>We are working on a merge helper script for this (and a number of</tt><br>
<tt>other use cases).</tt><br>
<br>
<tt>We will contribute this script once it is sufficiently usable.</tt><br>
<br>
<tt>- Nico</tt><br>
<br>
</body></html>
_______________________________________________
Svnmerge mailing list
Svnmerge@orcaware.com
http://www.orcaware.com/mailman/listinfo/svnmerge
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic