Peter,
I've tried to apply this patch to the 1.4.x branch today and it all worked
fine. In fact, what I think that happened is that I deleted some whitespaces
in r20011 which I accidently included in my test for your r20008. Since you
merged r20008 to the 1.4.x branch Wednesday evening the path applies cleanly
now.
Thanks for explaining me the normal patch promotion method, I'll try it on
my other proposals and create branches when needed.
Lieven.
> -----Original Message-----
> From: Peter N. Lundblad [mailto:peter@famlundblad.se]
> Sent: woensdag 21 juni 2006 20:47
> To: dev@subversion.tigris.org
> Subject: r20011 nomination to 1.4.x
>
> 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
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 23 20:56:48 2006