gnu-arch-users
[Top][All Lists]
Advanced

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

Re: [Gnu-arch-users] Google Summer of Code


From: Stephen J. Turnbull
Subject: Re: [Gnu-arch-users] Google Summer of Code
Date: Thu, 20 Apr 2006 19:29:55 +0900
User-agent: Gnus/5.1007 (Gnus v5.10.7) XEmacs/21.4.19 (linux)

>>>>> "John" == John Arbash Meinel <address@hidden> writes:

    John> Jeremy Shaw wrote:

    >> darcs get has a --partial flag:

    John> Can it annotate files if you have a --partial? And how well
    John> does it handle merging under those conditions?

"No", and "very likely barfs".  All annotation history is in the
patches, since that's the whole repo---there's not very much metadata
in darcs outside the patches.

If the common ancestor can be constructed by patching up from the
checkpoint, the merge will succeed.  Otherwise, not.  (There was some
talk of adding "backbuilder" capability, but I don't think it actually
happened yet.)


-- 
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba                    Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
               Ask not how you can "do" free software business;
              ask what your business can "do for" free software.




reply via email to

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