Mercurial > hg
view tests/test-update-names.t @ 29859:a1092e2d70a3
help: internals topic for wire protocol
The Mercurial wire protocol is under-documented. This includes a lack
of source docstrings and comments as well as pages on the official
wiki.
This patch adds the beginnings of "internals" documentation on the
wire protocol.
The documentation should have nearly complete coverage on the
lower-level parts of the protocol, such as the different transport
mechanims, how commands and arguments are sent, capabilities, and,
of course, the commands themselves.
As part of writing this documentation, I discovered a number of
deficiencies in the protocol and bugs in the implementation. I've
started sending patches for some of the issues. I hope to send a lot
more.
This patch starts with the scaffolding for a new internals page.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 22 Aug 2016 19:46:39 -0700 |
parents | b33c0c38d68f |
children | 90a6c18a7c1d |
line wrap: on
line source
Test update logic when there are renames or weird same-name cases between dirs and files Update with local changes across a file rename $ hg init r1 && cd r1 $ echo a > a $ hg add a $ hg ci -m a $ hg mv a b $ hg ci -m rename $ echo b > b $ hg ci -m change $ hg up -q 0 $ echo c > a $ hg up merging a and b to b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] Test update when local untracked directory exists with the same name as a tracked file in a commit we are updating to $ hg init r2 && cd r2 $ echo root > root && hg ci -Am root # rev 0 adding root $ echo text > name && hg ci -Am "name is a file" # rev 1 adding name $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkdir name $ hg up 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Test update when local untracked directory exists with some files in it and has the same name a tracked file in a commit we are updating to. In future this should be updated to give an friendlier error message, but now we should just make sure that this does not erase untracked data $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkdir name $ echo text > name/file $ hg st ? name/file $ hg up 1 abort: *: '$TESTTMP/r1/r2/name' (glob) [255] $ cd .. #if symlink Test update when two commits have symlinks that point to different folders $ hg init r3 && cd r3 $ echo root > root && hg ci -Am root adding root $ mkdir folder1 && mkdir folder2 $ ln -s folder1 folder $ hg ci -Am "symlink to folder1" adding folder $ rm folder $ ln -s folder2 folder $ hg ci -Am "symlink to folder2" $ hg up 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. #endif