Thanks for the idea, Atle. I'll try it.
-JP
On Tuesday, April 1, 2014 3:46 AM, Ræstad Atle Eivind
wrote:
> In the meantime, can you think of any workaround ...
As a workaround you might use Expect (http://en.wikipedia.org/wiki/Expect) in
your script.
/Atle
> In the meantime, can you think of any workaround ...
As a workaround you might use Expect (http://en.wikipedia.org/wiki/Expect) in
your script.
/Atle
Thanks a lot Stefan. At your suggestion I added this as an enhancement request:
http://subversion.tigris.org/issues/show_bug.cgi?id=4487
I don't have any opinion on whether a new --accept option or an entirely new
flag is best. I defer to your experience and judgment there. Thanks very much
t
On Mon, Mar 31, 2014 at 05:36:10AM -0700, JP wrote:
> I'm currently using svn 1.8.5 on the client and 1.8.3 on the server.
>
>
> If you attempt to "svn merge" a text file from the command-line where
> the same line has been modified in both file versions, you will see a
> report of the conflict
I'm currently using svn 1.8.5 on the client and 1.8.3 on the server.
If you attempt to "svn merge" a text file from the command-line where
the same line has been modified in both file versions, you will see a
report of the conflict, followed by this menu:
Select: (p) postpone, (df) show diff,
