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

Re: Blundered conflict

From: Jan Hendrik <jan.hendrik_at_myrealbox.com>
Date: 2007-01-28 18:21:54 CET

Addendum:

Concerning Blundered conflict
Jan Hendrik wrote on 27 Jan 2007, 12:03, at least in part:

> --- d:/Internet/xrates.py.r1792 Fri Jan 26 13:12:41 2007
> +++ d:/Internet/xrates.py.r1796 Fri Jan 26 13:12:41 2007
> @@ -434,7 +434,7 @@
>
> print tn.read_until(remote_host + "> ")
>
> - tn.write('/usr/bin/perl58 ./offscene/xrates_marine.pl\n')
> + tn.write('/usr/bin/perl58 ./offscene/xrates_ext.pl\n')
>
> print tn.read_until(remote_host + "> ")
> tn.write('exit\n')

xrates.py.svn-base on WC1 correctly reflects the modification (the
line reads " tn.write('/usr/bin/perl58 ./offscene/xrates_ext.pl\n'" as it
had been modified on WC2).

And no, although xrates.py was open in SciTE editor during the
update of WC1 it was not worked on as already the timestamp
should have suggested.

JH

---------------------------------------
Freedom quote:

     Democracy means that if the doorbell rings in the early hours,
     it is likely to be the milkman.
               -- Sir Winston Churchill

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 28 18:22:30 2007

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