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

r20011 nomination to 1.4.x

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-06-21 20:47:19 CEST

Hi,

I was trying to merge r200011 for voting onto the 1.4.x branch, but
it causes a (trivial) conflict. This is probably just a dependency on
another revision or something, but I don't have time to look deeper
right now.

What we normally do when nominating a change is to try to merge it.
If it causes conflicts, a short-lived branch (i.e. 1.4.x-r20011) is created
and the revision(s) is merged there and conflicts resolved.
Then, people wanting to vote and finally merge the change can just diff
the "integration branch". This is described in more detail in hacking.

Thanks,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 21 20:47:54 2006

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