Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- <pre>
- henry@torak:/tmp$ hg init a
- henry@torak:/tmp$ hg clone a intermediate
- updating to branch default
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp$ hg clone intermediate b
- updating to branch default
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp$ hg clone intermediate c
- updating to branch default
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp$ cd c
- henry@torak:/tmp/c$ date > date1.txt ; hg add date1.txt
- henry@torak:/tmp/c$ hg commit -m "c commit" ; bit push
- pushing to /tmp/intermediate
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- henry@torak:/tmp/c$ hg commit -m "c commit" ; hg push
- nothing changed
- pushing to /tmp/intermediate
- searching for changes
- no changes found
- henry@torak:/tmp/c$ cd ../b
- henry@torak:/tmp/b$ hg pull
- pulling from /tmp/intermediate
- requesting all changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
- henry@torak:/tmp/b$ hg update
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp/b$ ls
- date1.txt
- henry@torak:/tmp/b$ cd ../intermediate
- henry@torak:/tmp/intermediate$ ls
- henry@torak:/tmp/intermediate$ hg update
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp/intermediate$ cd ../b
- henry@torak:/tmp/b$ ls
- date1.txt
- henry@torak:/tmp/b$ date > datefromb.txt; hg add datefromb.txt ; hg commit -m "commit from b" ; hg push
- pushing to /tmp/intermediate
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- pushing to /tmp/intermediate
- searching for changes
- no changes found
- henry@torak:/tmp/b$ cd ../c ; ls
- date1.txt
- henry@torak:/tmp/c$ date > datefromc.txt ; hg add datefromc.txt ; hg push
- pushing to /tmp/intermediate
- searching for changes
- no changes found
- henry@torak:/tmp/c$ cd ../b; hg pull ; hg update
- pulling from /tmp/intermediate
- searching for changes
- no changes found
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp/b$ ls
- date1.txt datefromb.txt
- henry@torak:/tmp/c$ cd ../c; date > datefromc.txt ; hg add datefromc.txt; hg commit -m "push from c" ; hg push
- pushing to /tmp/intermediate
- searching for changes
- abort: push creates new remote head ba30fcc90ab6!
- (you should pull and merge or use push -f to force)
- warning: commit.autopush hook exited with status 255
- pushing to /tmp/intermediate
- searching for changes
- abort: push creates new remote head ba30fcc90ab6!
- (you should pull and merge or use push -f to force)
- henry@torak:/tmp/c$ hg pull ; hg update
- pulling from /tmp/intermediate
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads' to see heads, 'hg merge' to merge)
- abort: crosses branches (merge branches or update --check to force update)
- henry@torak:/tmp/c$ hg pull --rebase
- pulling from /tmp/intermediate
- searching for changes
- no changes found
- henry@torak:/tmp/c$ hg update
- abort: crosses branches (merge branches or update --check to force update)
- henry@torak:/tmp/c$ hg merge
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- (branch merge, don't forget to commit)
- henry@torak:/tmp/c$ hg commit -m "hg merge"
- pushing to /tmp/intermediate
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 1 changes to 1 files
- henry@torak:/tmp/c$ hg push
- pushing to /tmp/intermediate
- searching for changes
- no changes found
- henry@torak:/tmp/c$ ls
- date1.txt datefromb.txt datefromc.txt
- henry@torak:/tmp/c$ cd ..
- henry@torak:/tmp$ cd b
- henry@torak:/tmp/b$ ls
- date1.txt datefromb.txt
- henry@torak:/tmp/b$ hg pull ; hg merge ; hg update ; hg push
- pulling from /tmp/intermediate
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
- abort: nothing to merge
- (use 'hg update' instead)
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- pushing to /tmp/intermediate
- searching for changes
- no changes found
- henry@torak:/tmp/intermediate$ cd ../intermediate hg push
- pushing to /tmp/a
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 3 changes to 3 files
- henry@torak:/tmp/intermediate$ hg update
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- henry@torak:/tmp/intermediate$ ls
- date1.txt datefromb.txt datefromc.txt
- henry@torak:/tmp/intermediate$ hg push
- pushing to /tmp/a
- searching for changes
- no changes found
- henry@torak:/tmp/intermediate$ cd ../a ; ls
- henry@torak:/tmp/a$ hg update ; ls
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
- date1.txt datefromb.txt datefromc.txt
- </pre>
- my .hgrc
- <pre>
- [extensions]
- hgext.convert=
- rebase=
- [ui]
- username = Henry Crutcher <henry@equitieslab.com>
- [hooks]
- commit.autopush = hg push
- </pre>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement