>> What if you did all of your common work in a parent repository and
>> then cloned this to a child where you implement the specifics?
>
>This is no different from my presented scenario earlier in this thread.
>
>http://www.abridgegame.org/pipermail/darcs-users/2006-November/
>010634.html
Thanks for the clarification.
>
>> If and when you want to push back changes to the parent, can't you
>> just cherry pick what should go back?
>
>To make cherry picking easier, I recommend prefixing patch
>names for local changes with something. In my case, I maintain
>a database of client numbers. So patches for local changes
>that are specific to a client (or project) get prefixed with
>something like:
>
>C0001: <patch name here>
>
>Then when I push I do:
>
>darcs push --matches="not name C0001:"
Interesting approach.
>
>This will make darcs ignore patches with the prefix during the push.
>Of course this will break if one of your patches to your
>common source tree depend on any of the "local" changes you
>made so you should make sure that this does not happen in the
>first place. In this case, darcs will not push anything that
>depends on the local patch due to the ---matches option you specified.
Are you talking about patches where that have been recorded using the
--ask-deps option, or just patches that have some functional dependency
on a previous patch?
I assume that in the former, darcs will prevent the push from breaking
the parent and in the latter, the push operation will silently break the
parent. Is this correct?
>
>You could also do the reverse of what I am doing. That is,
>prefix patch names for changes that should go into your common
>code base (e.g., MAIN:). Then do:
>
>darcs push --matches="name MAIN:"
>
>But then this will make it more difficult to avoid pushing
>changes that should stay in your local repository. If any of
>your patches depend on a local patch, it will still be pushed
>into your common code base.
*****************************************************
You can find us at www.voca.com
*****************************************************
This communication is confidential and intended for
the exclusive use of the addressee only. You should
not disclose its contents to any other person.
If you are not the intended recipient please notify
the sender named above immediately.
Registered in England, No 1023742,
Registered Office: Voca Limited
Drake House, Three Rivers Court,
Homestead Road, Rickmansworth,
Hertfordshire, WD3 1FX
This message has been checked for all email viruses by MessageLabs.
_______________________________________________
darcs-users mailing list
[email protected]
http://www.abridgegame.org/mailman/listinfo/darcs-users
