[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: |
Jason Rumney |
Subject: |
Re: Missing file in EMACS_22_BASE (GIT repo) |
Date: |
Fri, 05 Oct 2007 11:23:05 +0100 |
User-agent: |
Thunderbird 2.0.0.6 (Windows/20070728) |
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 does not represent a release,
or a snapshot in time. This is no different than the
emacs-unicode-2-base tag, which as I pointed out is also pointing at
revision 1.1 of the file, despite the different mechanism used to get it
onto the branch.
> 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. There is then a deleted revision (1.1.2.1) on
the emacs-unicode-2 branch, with the same timestamp as the original
addition of version 1.1, so the only way to get revision 1.1 on that
branch is to use the emacs-unicode-2-base tag. Then 46 hours later, when
Miles did the automated merge, the file comes back into existence. CVS
does it this way if you later do a "cvs add", because CVS assumes that
for the previous 46 hours, the file should not exist on the branch. But
in the case of the EMACS_22_BASE branch, there is no automatic merge, so
I manually added it at the same time as I added the trunk. Since there
was no delay, there is no need for a deleted revision on the branch.
- Re: Missing file in EMACS_22_BASE (GIT repo), (continued)
- 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 <=
- Re: Missing file in EMACS_22_BASE (GIT repo), Andreas Schwab, 2007/10/05