Norbert Koch writes:
I need to push the top-level ChangeLog in the package repository.
fails due to cross-branch stuff. I suppose it would succeed if I could
push only this directory. Is this possible?
No. A commit *adds nodes* to the local DAG. At that point you can
specify the content (diff) of the node as you like. A push
synchronizes the remote DAG to the local one; you can only push nodes
you have already committed, and you must do so in a way that is
IIRC, in general, there are two ways to deal with cross-branch issues.
One is to strip the errant commits and redo them in the right branch.
The other is to merge the heads. You probably don't want to do either
until we know more about what's going on.
What exactly is the error message? What are the branches that are in
conflict, if the error doesn't tell you?
XEmacs-Beta mailing list