[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge-revert-merge bug?

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Tue, 1 Sep 2009 07:51:51 -0700

On Tue, Sep 01, 2009 at 05:58:02AM +0000, ogge dask wrote:
> Steps to reproduce:
> 1. Merge a branch that adds new files.
> 2. Revert the working copy, now the added files remain but are not marked as added any more.

Right here, you are no longer merging into a clean working copy. "svn
status" will show this.

> 3. Merge same branch again. Now the files that are already there from the first merge, are skipped and not added.
> Is that the desireable effect? In my scenario it isn't since I missed some files in the commit.

Imagine a scenario where you added files to your working copy (you
haven't svn add'ed them yet, but that doesn't matter) and then a merge
wants to add files with the same names. Do you want Subversion to
clobber your existing files with new files from the merge? Or do you
want it to warn you and not delete files from your working copy?

I want the second behavior because I don't like losing stuff. And that's
what svn does!



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-01 16:52:52 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.