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

Re: [BUG] Data loss when committing a new file which is a target of multiple merges

From: David Anderson <david.anderson_at_calixo.net>
Date: 2006-07-13 03:10:33 CEST

* Daniel Rall <dlr@collab.net> [2006-07-10 15:08:49]:
> I've attached a reproduction recipe and output. In the recipe, the
> "copied from" info should cite r6 of foo.txt. Instead, it cites r5
> (the end of the first merge).

Daniel has commited a fix to the timestamping issue uncovered in this
thread in r20609. Could commiters please review this and approve it
for backport into 1.4.x ?

This is a fix we'd really like to have in 1.4.0. I'll be rolling RC2
in about 12 hours, so if we could get this patch into 1.4.x by then
it'd be great!

- Dave

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 13 03:10:31 2006

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