List Info

Thread: commit-dependencies




commit-dependencies
user name
2006-04-14 16:27:54
heya,

in case you're wondering why i was so silent recently ...
it just
occurred to me, that the silence in my cvs2svn mailbox must
have been
caused by me being thrown off dev and commits without
any notice ... a
short look in the archieve revealed that this must have
happened two
months ago. not that these are exactly high-traffic lists,
but obviously
i didn't have the time/consciousness to question the
probability of this
list staying *entirely* silent for such a long time. :}

anyway, back on topic. a quick "svn merge -r 1802:1820
$svn_trunk_dir"
revealed that only one minor conflict has to be eliminated
(i can
attach a patch, but assuming that you want to use svnmerge
to let it
generate an appropriate commit log, it will be really faster
if you
resolve it by hand).

now let's reiterate from a previous mail:

> i think commit-dependencies is ready for merging back.
> the diff is reasonably small, but it is still possible
to split it.
> anyway, looking at the merges so far i assume this is
not required.

i'd like to hear this assertion confirmed or denied. then i
would
prepare a patch/commit log [series] for final merging.

-- 
Hi! I'm a .signature virus! Copy me into your ~/.signature,
please!
--
Chaos, panic, and disorder - my work here is done.

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribecvs2svn.tigris.org
For additional commands, e-mail: dev-helpcvs2svn.tigris.org

commit-dependencies
user name
2006-04-21 17:54:58
Oswald Buddenhagen wrote:
> anyway, back on topic. a quick "svn merge -r
1802:1820 $svn_trunk_dir"
> revealed that only one minor conflict has to be
eliminated (i can
> attach a patch, but assuming that you want to use
svnmerge to let it
> generate an appropriate commit log, it will be really
faster if you
> resolve it by hand).

I just did this merge and committed it as r1821.  Please let
me know if
you see any mistakes.

With this merge, the commit-dependencies branch should work
under Python
2.2 (I hope).

Michael

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribecvs2svn.tigris.org
For additional commands, e-mail: dev-helpcvs2svn.tigris.org

commit-dependencies
user name
2006-04-21 20:07:39
On Fri, Apr 21, 2006 at 07:54:58PM +0200, Michael Haggerty
wrote:
> Oswald Buddenhagen wrote:
> > anyway, back on topic. a quick "svn merge -r
1802:1820 $svn_trunk_dir"
> > revealed that only one minor conflict has to be
eliminated [...].
> 
> I just did this merge and committed it as r1821. 
Please let me know if
> you see any mistakes.
> 
all fine. thx.
now back to the question how you think we should proceed
with the merge
into trunk. one patch or multiple?

-- 
Hi! I'm a .signature virus! Copy me into your ~/.signature,
please!
--
Chaos, panic, and disorder - my work here is done.

------------------------------------------------------------
---------
To unsubscribe, e-mail: dev-unsubscribecvs2svn.tigris.org
For additional commands, e-mail: dev-helpcvs2svn.tigris.org

[1-3]

about | contact  Other archives ( Real Estate discussion Medical topics )