I was doing some work, and decided that I wanted to commit that work to a
new branch, so as to not distrub other developers too badly... I still
haven't completely tested the changes, but it turns out that the changes
were included in the main branch anyhow because I then made some other
changes
What you're missing in the whole thing is the ancestry. You see, with
your last commit (which is to branch1), you're using the previous
commit (which is in branch2) as ancestor, so even if you're not doing
a propagate, you are producing a history that goes back and forth
between the branches.
To
On 5/22/07, Richard Levitte [EMAIL PROTECTED] wrote:
What you're missing in the whole thing is the ancestry. You see, with
your last commit (which is to branch1), you're using the previous
commit (which is in branch2) as ancestor, so even if you're not doing
a propagate, you are producing a
J == J Decker J writes:
J mtn --db=test.db db init
J mtn --db=test.db genkey temp
J mtn --db=test.db --key=temp --branch=branch1 setup .
J echo Branch1 file
J mtn --db=test.db --key=temp add file
J mtn --db=test.db --key=temp commit -m Begin branch1
J echo
On 5/22/07, Brian May [EMAIL PROTECTED] wrote:
J == J Decker J writes:
J mtn --db=test.db db init
J mtn --db=test.db genkey temp
J mtn --db=test.db --key=temp --branch=branch1 setup .
J echo Branch1 file
J mtn --db=test.db --key=temp add file
J mtn --db=test.db
