amaslov <amaslov.p@gmail.com> writes:
> Hello,
>
> I have been using local branches in git, maybe this breaks my attempts to
> master hg bookmarks...
>
> With Mercurial 1.2.1 I do the following:
> 1) create a repository (let's call it "repo1"), add a file "file1.txt"
> there, commit it
> 2) clone the repository (let's call this one "repo2"), add bookmarks
> extension and "track.current = True" under "[bookmarks]" to hgrc, create
> bookmarks "master" and "quickfix" there
> 3) at repo2: "hg up -C quickfix", change the file "file1.txt", commit it
> 4) at repo2: switch to master: "hg up -C master", hg out - and see that the
> changes to "file1.txt" are propagated into push.
>
> I expected that only changes to the branch I am on are propagated
> into push. Is it an expected behavior?
Yes, sort of -- push/pull simply move any missing changesets between
repositories. If you want to move only some revisions you can use the -r
flag to them (and to outgoing too).
I haven't tried, but I would guess that 'hg outgoing -r master' would
show only new changesets on your branch.
--
Martin Geisler
VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See:
http://viff.dk/.
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
