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

Merge-revert-merge bug?

From: ogge dask <mt02caro_at_yahoo.se>
Date: Tue, 1 Sep 2009 05:58:02 +0000 (GMT)

I have found a potential bug, in any case it doesn't behave as expected:

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.
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.

/Calle

Version info (on Vista x64):
TortoiseSVN 1.6.5, Build 16974 - 64 Bit , 2009/08/20 08:13:46
Subversion 1.6.5,
apr 1.3.8
apr-utils 1.3.9
neon 0.28.6
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3

      __________________________________________________________
Låna pengar utan säkerhet. Jämför vilkor online hos Kelkoo.
http://www.kelkoo.se/c-100390123-lan-utan-sakerhet.html?partnerId=96915014

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-01 08:00:10 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.