external diff3-cmd trouble during svn update
From: Roel Harbers <roel_at_roelharbers.nl>
Date: 2004-09-22 15:40:50 CEST
Hi,
I use a special "false.exe" program as external diff3 command: all it
However, with v1.1.0RC3, when I do an svn update on a file that has
I'm using svn v1.1.0RC3 on WinXP Pro SP1.
--- recipe:
D:\svn\Repositories>svnadmin create Repositories\Test
D:\svn>copy con test.txt
D:\svn>svn import -m"import file" test.txt
Committed revision 1.
D:\svn>svn co file:///D:/svn/Repositories/Test test1
D:\svn>svn co file:///D:/svn/Repositories/Test test2
D:\svn>svn co file:///D:/svn/Repositories/Test test3
now, edit D:\svn\test1\test.txt to:
and edit D:\svn\test2\test.txt to:
and edit D:\svn\test3\test.txt to:
D:\svn>svn ci -m"changed first line" test1
D:\svn>svn st -u test2
D:\svn>svn st -u test3
D:\svn>svn up test2
D:\svn>dir test2
22-09-2004 15:17 <DIR> .
D:\svn>svn up test3
D:\svn>dir test3
22-09-2004 15:25 <DIR> .
So, svn update says the merge in test2 (where the merge would have
In test3 (where the merge would not have succeeded, even when the
I would have expected both svn update commands to display C.
--- I could send you the false.exe if you want, but all it does is return 1 as errorcode. Is there anything more such a program would need to do? I could not find the specification of what a program should do to be callable as a diff3 command. Regards, Roel Harbers --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived on Wed Sep 22 15:41:23 2004 |
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.