info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: About playing with sticky dates, the art with no cvs dir


From: David D
Subject: Re: About playing with sticky dates, the art with no cvs dir
Date: Tue, 8 Jan 2002 17:08:52 +0100

I think the only way is to do it bu hand.

I explain :
Even If I make a diff beetween :
the result of merge of copy1 n cvs
and copy2

the code substract issue to the diff beetween copy1+cvs and copy2 can
correspond to :
the code wich was added when copy1 merge to cvs
or ths code
which was surely to remove

Or we can t do it automatically only a human can do, a person wich now about
the project.

I can start form copy1 not marged with cvs and copy2 then make a diff.
But copy2 has conflit that copy1 had which had been resolve by a human to,
perhaps it easy like that
because these conflicts were already know.


a+.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]