merging unrelated branches

[Harald Meland]

[Jelmer Vernooij]

> Am Montag, den 22.12.2008, 23:08 -0500 schrieb Stefan Monnier:
>> In Arch, this was easy to do by setting the arch-tag (or the
>> .arch-ids/foo.id file) accordingly, but since file-identities seem to be
> I'm not familiar with arch, but was that feature called "file id
> aliases" ?

No.

Arch has a one-to-one relation between files/directories and their
corresponding ID -- but you could choose between a few different
schemes ("id tagging methods") for how the relationship was stored.

One of the schemes ("tagline", which is the one Emacs uses, I think)
allows you to specify a file's identity in a special "arch-tag:" line
near the start/end of your (text) files.  A file's identity still
needs to be unique within your tree, and each file can have only a
single identity.

(For binary files, where such "arch-tag:" lines are impractical at
best, a file "foo/bar" would instead store its identity in a separate
file "foo/.arch-ids/bar.id".  There is another scheme called
"explicit" where this is how *all* files, regardless of their internal
content, store their identity.)
-- 
Harald