[Top][All Lists]

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

Re: Emacs antialiasing in X

From: David Abrahams
Subject: Re: Emacs antialiasing in X
Date: Mon, 16 Jan 2006 15:17:50 -0500
User-agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux)

"Jan D." <address@hidden> writes:

>> Are you keeping a tag on the trunk for the last revision you've merged
>> into your branch?  If so,
>>      cvs up -jLastMergeTag -jHEAD
>> should get you an incremental merge with no bogus conflicts.  And then
>> I could use your LastMergeTag to merge with emacs-unicode-2 with fewer
>> conflicts as well.
> No tag, but you can use the date specifier, the cvs log message gives
> the date.

Thanks, I'll do that.  FWIW, if you do use such tags you can
substantially reduce the number of conflicts you see upon merging.

Dave Abrahams
Boost Consulting

reply via email to

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