[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing file in EMACS_22_BASE (GIT repo)
From: |
Andreas Schwab |
Subject: |
Re: Missing file in EMACS_22_BASE (GIT repo) |
Date: |
Fri, 05 Oct 2007 13:58:37 +0200 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (gnu/linux) |
Jason Rumney <address@hidden> writes:
> Andreas Schwab wrote:
>>> The EMACS_22_BRANCHPOINT tag is supposed to be there as an aid to
>>> automated merging.
>>>
>>
>> No. The tag is supposed to represent the branch point exactly.
>>
>
> Right. It represents the point where each file was branched from the
> trunk, as an aid to automated merging.
It has nothing to do with merging. It is *the* branch point and
represents the tree directly *before* branching. The recommended
procedure for branching is to create a tag and _then_ create the branch
based on this tag.
>> The emacs-unicode-2-base tag is indeed a moving tag.
>>
>
> It's not moving, it is fixed on version 1.1, the branchpoint for the
> emacs-unicode-2 branch.
That revision never existed on that branch, only on the trunk.
Andreas.
--
Andreas Schwab, SuSE Labs, address@hidden
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
- Re: Missing file in EMACS_22_BASE (GIT repo), (continued)
- Re: Missing file in EMACS_22_BASE (GIT repo), Jason Rumney, 2007/10/05
- Re: Missing file in EMACS_22_BASE (GIT repo), Andreas Schwab, 2007/10/04
- Re: Missing file in EMACS_22_BASE (GIT repo), Andreas Schwab, 2007/10/04
- Re: Missing file in EMACS_22_BASE (GIT repo), Jason Rumney, 2007/10/04
- Re: Missing file in EMACS_22_BASE (GIT repo), Andreas Schwab, 2007/10/04
- Re: Missing file in EMACS_22_BASE (GIT repo), Jason Rumney, 2007/10/04
- Re: Missing file in EMACS_22_BASE (GIT repo), Andreas Schwab, 2007/10/05
- Re: Missing file in EMACS_22_BASE (GIT repo), Jason Rumney, 2007/10/05
- Re: Missing file in EMACS_22_BASE (GIT repo), Andreas Schwab, 2007/10/05
- Re: Missing file in EMACS_22_BASE (GIT repo), Jason Rumney, 2007/10/05
- Re: Missing file in EMACS_22_BASE (GIT repo),
Andreas Schwab <=