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

Merge bug

From: <braulio.horta_at_embraer.com.br>
Date: 2007-11-28 16:24:09 CET

I think i found a bug.
I'm using TSVN 1.4.99.11351

I'm trying a merge and each time i click "test merge", it seens TSVN try a different revision range.

Ex.:
- I made a branch(mybranch) from trunk with 3 files (FileA.txt, FileB.txt, FileC.txt) on rev 77
- I made a FileA.txt on rev 78
- I made a FileB.txt on rev 79
- I made a FileC.txt on rev 80

- I switch to trunk
- Then i try to merge to trunk only change made on rev 80.

- 1st click -
Command: Merging revisions 79-80 of file:///C:/My repo/branches/mybranch into C:\My Working Copy, respecting ancestry, Test Only
Merging r79 through r80: C:\My Working Copy
Updated: C:\My Working Copy\FileC.txt
Finished!:

- 2nd click -
Command: Merging revisions 78-80 of file:///C:/My repo/branches/mybranch into C:\My Working Copy, respecting ancestry, Test Only
Merging r78 through r80: C:\My Working Copy
Updated: C:\My Working Copy\FileB.txt
Updated: C:\My Working Copy\FileC.txt
Finished!:

- 3rd click -
Command: Merging revisions 77-80 of file:///C:/My repo/branches/mybranch into C:\My Working Copy, respecting ancestry, Test Only
Merging r77 through r80: C:\My Working Copy
Updated: C:\My Working Copy\FileA.txt
Updated: C:\My Working Copy\FileB.txt
Updated: C:\My Working Copy\FileC.txt
Finished!:

And so on....

When you try the real merge, it changed the range.

Can you confirm it?

[]s

Braulio
 <BR><em><font size='2' face='Arial'><hr>This message is intended solely for the use of its addressee and may contain privileged or confidential
information. If you are not the addressee you should not distribute, copy or file this message. In this case, please notify the sender and
destroy its contents immediately.<BR>Esta mensagem é para uso exclusivo de seu destinatário e pode conter informações privilegiadas e
confidenciais. Se você não é o destinatário não deve distribuir, copiar ou arquivar a mensagem. Neste caso, por favor, notifique o remetente da
mesma e destrua imediatamente a mensagem.</font></em>
Received on Wed Nov 28 16:24:27 2007

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

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