Re: How to merge a rename of a folder

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 11 Oct 2012 02:59:51 +0200

Stefan Sperling wrote on Wed, Oct 10, 2012 at 22:14:49 +0200:
> On Tue, Oct 09, 2012 at 09:10:41PM +0200, Martin Bischoff wrote:
> > Instead of merging revision N and resolving the conflicts, would a
> > record-only merge of revision N give the same result?
>
> Yes, except that record-only merges will update all subtree
> mergeinfo within the merge target, if any exists.

... which matters if rN contained changes other than renaming
a directory.
Received on 2012-10-11 03:10:10 CEST

This message: [ Message body ]
Next message: cz02_at_cdak.net: "SVN patch IGNORES file without newline at end of file"
Previous message: Stefan Sperling: "Re: Merge bringing in much more than the specified changes"
In reply to: Stefan Sperling: "Re: How to merge a rename of a folder"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]