[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
How to merge and push?
From: |
Søren Hauberg |
Subject: |
How to merge and push? |
Date: |
Sun, 07 Mar 2010 22:55:40 -0800 |
Hi All
I have a stupid Mercurial question... I just pushed a small change to
'dim-vector.h'. When I first tried to push I was told that this would
create to upstream branches, so I did a
hg pull ssh://address@hidden/octave
hg merge
which told me I had to commit to complete the merge. So, I did a
hg commit -m "Merged with upstream"
I then pushed my change to 'dim-vector.h' without problems. Now, I see
that the tip is
http://hg.savannah.gnu.org/hgweb/octave/rev/b40a5fd3af41
which corresponds to the merge i performed. I guess this means I must
have screwed up somehow as it doesn't seem sensible that the upstream
repository should be bothered with how and when I merge stuff.
So, my question is: what did I do wrong and how should I have done?
Thanks,
Soren
- How to merge and push?,
Søren Hauberg <=