Commit Graph

1990 Commits

Author SHA1 Message Date
Adrian Buehlmann
f3f0f9ecd6 introduce fncache repository layout
* adds a new entry 'fncache' to '.hg/requires' for new repos
* writes new file '.hg/store/fncache'
* hash-encodes filenames with long paths (issue839)
* encodes Windows reserved filenames (issue793)
2008-10-19 19:12:07 +02:00
Mads Kiilerich
156ce431aa Make it possible to disable filtering for a pattern.
Rationale: Apparently there were no way to disable for example win32text extension locally.

RFC: Can it already be done another way?
2008-10-14 21:28:49 +02:00
Patrick Mezard
f93bdf76d1 Merge with crew-stable 2008-10-23 15:44:23 +02:00
Patrick Mezard
54f7c66fa0 convert: read git output in binary mode under Windows (issue 1359) 2008-10-23 14:05:11 +02:00
Matt Mackall
38344e11c6 inotify: auto-start by default when enabled 2008-10-22 19:40:29 -05:00
Matt Mackall
3c69f4c760 run-tests: --interactive overrides -j 2008-10-22 17:34:37 -05:00
Matt Mackall
e617903e64 Autodetect static-http 2008-10-22 15:41:32 -05:00
Matt Mackall
ee921a6080 help: update help
make help description 'topic'-oriented rather than 'command'-oriented
change 'special' to 'additional'
2008-10-22 14:30:34 -05:00
Benoit Boissinot
97977f767e tests: log and show errors 2008-10-22 21:39:56 +02:00
Dirkjan Ochtman
adb2a35499 tests: add more testing for webdir nesting 2008-10-22 18:32:17 +02:00
Benoit Allard
31ab3aeaed hgwebdir: show nested repositories (issue1336) 2008-10-22 18:23:32 +02:00
Dirkjan Ochtman
896a6939aa help: show extension commands in short list, separate extension list in help
In 'hg', we now show a short list of commands, including extension commands.
In 'hg help', we show core commands, a list of enabled extensions, and topics.
2008-10-21 11:29:27 +02:00
Thomas Arendsen Hein
614711f636 merge with crew 2008-10-20 18:29:44 +02:00
Christian Ebert
576714b48a mail: test patch mime encoding for patchbomb 2008-10-20 17:40:29 +02:00
Dirkjan Ochtman
f5ea74b223 clean up trailing spaces, leading spaces in C 2008-10-20 14:57:04 +02:00
Dirkjan Ochtman
664ef048a7 merge with crew-stable 2008-10-20 14:52:58 +02:00
Dirkjan Ochtman
e085823cf1 clean up trailing spaces 2008-10-20 14:51:55 +02:00
Dirkjan Ochtman
cc867a892e hgweb: working diff for removed files 2008-10-20 14:13:37 +02:00
Mads Kiilerich
905ce16584 mq: Fix --qrefresh --short to work with --exclude and --include
pmezard expects
	hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before c302ef4372b2. That change seemed sensible, but it
wasn't...

mpm says
	(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
	(17:22:54) pmezard_: kiilerix1: and --include too
	(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
	hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch

This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.
2008-10-19 16:31:24 +02:00
Thomas Arendsen Hein
1493b09823 Merge with crew 2008-10-19 19:10:26 +02:00
Thomas Arendsen Hein
d6b1ca4cb9 Use dummy diffstat in tests and remove older diffstat workaround.
This makes test-notify pass on systems without diffstat installed
or where the diffstat version yields a different output.
2008-10-19 19:03:23 +02:00
Thomas Arendsen Hein
c740f7ded2 Fix test-bundle-type output by changing head|cut to cut|head.
With some versions of cut the output otherwise has no end of line.
2008-10-19 17:40:35 +02:00
Thomas Arendsen Hein
0bafe8661c convert documentation: --config argument with spaces needs quoting. 2008-10-19 15:24:33 +02:00
Benoit Boissinot
33a3a545ff merge with crew 2008-10-19 13:00:36 +02:00
Thomas Arendsen Hein
68521aa75e Fix test-notify output for older diffstat versions. 2008-10-19 12:34:34 +02:00
Benoit Boissinot
980f1548c1 hgweb: nodeids should be aligned in raw changesets
If they aren't it breaks hg import --exact
Thanks to Jesper Noehr for noticing it.
2008-10-19 12:23:58 +02:00
Brendan Cully
c935fe6e01 mq: abort qnew -f if any file in an explicit list cannot be read 2008-10-18 20:45:53 -07:00
Brendan Cully
eeb6237595 mq: make qimport -f work properly. Closes issue1255.
From Bernhard Leiner.
2008-10-18 17:29:45 -07:00
Brendan Cully
a52b846f5d Merge with crew 2008-10-18 16:53:44 -07:00
Brendan Cully
08cb02aa5a mq: let qimport read patches from URLs 2008-10-18 16:40:01 -07:00
Benoit Boissinot
27bcc719e6 add a missing +x to test-inotify-lookup 2008-10-19 01:28:35 +02:00
Benoit Boissinot
56d9a3258b merge with crew 2008-10-18 23:20:23 +02:00
Benoit Boissinot
3babcafb3e inotify: fix status not showing "clean" files (issue907)
The inotify server uses 'c' for clean, not 'n'.
2008-10-18 23:06:29 +02:00
Benoit Boissinot
624e32832b run-tests.py: report missing file as an error 2008-10-18 22:44:01 +02:00
Brendan Cully
cc3761c2b3 Merge with crew 2008-10-18 13:22:46 -07:00
Brendan Cully
203e3723e8 Prevent import over an applied patch (closes issue795) 2008-10-18 13:22:29 -07:00
John Mulligan
636223becf issue 1144: prevent traceback on verify of bundles 2008-10-18 14:43:14 -04:00
Benoit Boissinot
44d89759ff run-tests.py: use --prefix instead of --home
Some SUSE version don't like --home, they fail with:
"error: must supply either home or prefix/exec-prefix -- not both"

this is due to SUSE shipping a distutils.cfg conflicting with --home.
2008-10-18 21:08:44 +02:00
Benoit Boissinot
4e105a6d69 test-permission: put sane permissions at the end of the test
If we don't do that, we won't delete all directories at the end of the test
2008-10-18 20:47:47 +02:00
Dirkjan Ochtman
1830efd60d tests: fix output for test-notify 2008-10-18 18:24:37 +02:00
Stefano Tortarolo
7658d9947c rebase: disable rollback after rebasing 2008-10-18 17:00:28 +02:00
Dirkjan Ochtman
c5e3760e1d help: better documentation intro for a few extensions 2008-10-18 16:56:39 +02:00
Patrick Mezard
910e49f24f test-doctest: remove TERM env variable only if it's there 2008-10-11 16:40:59 +02:00
Patrick Mezard
3eb95e081f convert: properly encode subversion URLs (issue 1224) 2008-10-10 11:36:02 +02:00
Dirkjan Ochtman
fcf19417f1 clone: honor -r even when pulling named branches 2008-09-24 13:10:09 +02:00
Benoit Boissinot
0d1cd8705f Escape '%' when writing to hgrc (issue1199)
Fixes clone with paths containing '%'.
Patch provided by mjc.
2008-09-20 15:00:58 +02:00
Dennis Schoen
ed4bd4d0e6 tests: add test for notify extension as changegroup hook 2008-09-18 13:55:58 +02:00
Mads Kiilerich
b80093e190 tests: fix reported patch tool name in test-mq
Strip any path of the patch executable, which it might return on failure.
2008-09-18 13:45:36 +02:00
Mads Kiilerich
b0d9bb04f5 tests: fix readline escape characters in output for test-doctest.py 2008-09-18 13:48:41 +02:00
Dirkjan Ochtman
87abdc361c tests: fix test-highlight for compatiblity with newer Pygments 2008-09-17 11:14:06 +02:00
Benoit Boissinot
d6add1b5a8 forbid username with '\n' at the changelog level
It was already forbidden for ui.username() but no verification were
made for username passed through the commandline.
2008-09-13 17:46:09 +02:00
Benoit Boissinot
fdb31340ce run-tests.py: fix the check for the hg installation with -jn (n > 1) 2008-09-10 13:52:33 +02:00
Benoit Boissinot
bb6f34eb86 inotify: add client code for long pathname handling 2008-09-07 15:10:11 +02:00
Benoit Boissinot
6600c99d5a inotify: workaround ENAMETOOLONG by using symlinks
If we can't create the unix socket because the path is too long
we create the socket in a temporary directory and symlink it into
the repo.

Fix issue1208
2008-09-06 14:11:33 +02:00
Benoit Boissinot
5b0f8d909f inotify: deactivate inotify status on failure
workaround issue1208, add test
fix traceback handling (socket.error is a singleton in this case)
2008-09-06 12:49:20 +02:00
Benoit Boissinot
3e99382003 fix test-bisect error (because of set -e) 2008-09-05 11:02:12 +02:00
Dirkjan Ochtman
f785a1c716 bisect: only complain when nothing can be done 2008-09-03 19:00:43 +02:00
Dirkjan Ochtman
8c471ba704 imported patch test-check 2008-09-03 19:01:35 +02:00
Patrick Mezard
a5a7a649cf graphlog: fix calls from outside the repository (issue1285) 2008-09-02 09:25:29 +02:00
Dirkjan Ochtman
83b9ec89ae bisect: status message when no action is specified 2008-08-21 19:02:56 +02:00
Christian Ebert
51ca48048e Make test-hardlinks-safety portable
On some systems cp cannot create/preserve hardlinks.
Use util.copyfiles instead, after making sure it actually does
create hardlinks.
2008-08-20 17:58:12 +02:00
Thomas Arendsen Hein
0e5b328695 Adjust test output for hg help qrecord since 0fd032cb1106 2008-08-20 15:04:45 +02:00
Dov Feldstern
7805ceec07 test symlinks on symlink-capable os but non-capable filesystem (issue1149)
The "real" way to test this is to mount a non-symlink-capable filesystem, and
try working on it; however, I don't know how to mount filesystems as a
non-priveleged user from within the testing framework. So instead, os.symlink
is overridden to raise the exception that would be raised on such a filesystem.
2008-07-31 22:41:19 +03:00
Matt Mackall
4d074f2f87 add a fix for issue 1175
If we copy a file followed by an update, it's possible for the parent
manifest to no longer contain the source file of the copy, which could cause
commit to fail. If this happens, we search backwares from the first
parent to find the most likely original revision.
2008-08-10 18:01:03 -05:00
Thomas Arendsen Hein
67623d98de Make test-convert-mtn pass on systems where mtn add -R uses different order 2008-08-09 11:46:20 +02:00
Thomas Arendsen Hein
d912d56f04 Make test-hardlinks-safety repeatable and executable 2008-08-08 18:48:26 +02:00
Bernhard Leiner
12387fffd4 add additional bisect tests 2008-08-02 22:10:54 +02:00
Bernhard Leiner
41c8918f2f add additional complex bisect tests (with non-linear history) 2008-08-02 22:11:22 +02:00
Patrick Mezard
c717caba48 Fix subversion tests with svn 1.5 2008-07-30 22:26:41 +02:00
Benoit Boissinot
9d636a4b09 make mq and tags hardlink safe
The code didn't check for modes like "r+" or "rb+".
Many thanks to agriffis for noticing it.
2008-07-23 16:08:20 +02:00
Patrick Mezard
1277ce4266 test-branches: add a test for long branch name (issue 1230) 2008-07-20 21:00:13 +02:00
Patrick Mezard
42c2e73f4f mq: fix qrefresh losing copy information (issue 1134) 2008-07-07 09:16:09 +02:00
Brendan Cully
2aef8dbc09 Check that git patches only touch files under root 2008-06-25 14:13:20 -07:00
Thomas Arendsen Hein
6fbdf04649 run-tests.py: Make tests run with python2.3 if HGTEST_* is set.
optparse of python2.3 does not transform default values to the specified
type so e.g. "HGTEST_JOBS=4" (introduced in b8e8d6b0ae08) causes tests
to abort, because options.jobs is set to '4' instead of the number 4.
2008-06-16 11:37:26 +02:00
Patrick Mezard
c7f6f81b90 Ignore dummy copies in dirstate and localrepo.filecommit() 2008-06-15 13:01:03 +02:00
Dirkjan Ochtman
fc7fc528ad show enabled extensions in hg help 2008-10-18 16:50:03 +02:00
Benoit Allard
38a25978ad graph: replace the blinking no javascript message 2008-10-18 16:09:07 +02:00
Christian Ebert
5cbc9e210a highlight: convert text to local before passing to pygmentize (issue1341)
Example case:
Display file written in iso-8859-1 with current HGENCODING utf-8.
At the moment only an Error page appears because pygmentize
chokes on the replacement chars.

Alternatives:
1) Turn off highlighting and avoid UnicodeDecodeError
   for files that are not in HGENCODING.
2) [this patch] use util.tolocal to display these files.

Alternative 2) seems ok, as this only concerns display and
readability.

See also: c5f1a58b8b9a, apparently put aside during refactor of
highlight.

Add test for UnicodeDecodeError with iso-8859-1 file contents.
2008-10-17 12:12:33 +02:00
Christian Ebert
586a27bcb7 notify: mime-encode messages
- addresses will be properly encoded
- message bodies will also be encoded as we are not sending
  patches that are meant to be applied
- update test output
- adapt test-keyword to ignore the new headers
2008-07-12 19:12:18 +01:00
Mads Kiilerich
552c248fa5 mq: Allow qrefresh --silent to take parameters
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.

This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.

FIXME: Why do mq refresh have two matchers if we only need one?
2008-10-17 21:26:39 +02:00
Bernhard Leiner
78aef95fe0 Add parseindex2.py test case
Make sure that the new implementation in C return that same values as the
original Python implementation.
2008-10-17 01:05:10 +02:00
Dirkjan Ochtman
fc7a3b7024 tests: add some testing for patch.diffstat() 2008-10-17 17:34:25 +02:00
Benoit Boissinot
d6688cc959 bdiff: normalize the diff (issue1295)
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
2008-10-14 20:13:53 +02:00
Patrick Mezard
71877ea8d9 convert: make built-in cvsps the default
Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>
2008-10-15 20:14:28 +02:00
Benoit Boissinot
6f9f41a33d merge with crew 2008-10-15 16:27:36 +02:00
Benoit Boissinot
1d33f1c63b dirstate.walk: skip unreadable directories (issue1213)
Do not abort on permission denied error, just skip the directory.
2008-10-15 14:52:27 +02:00
Benoit Boissinot
45680829ac dirstate._dirs: fix refcounting broken by ece124266b74
reported by Patrick Waugh
2008-10-15 01:14:29 +02:00
Patrick Mezard
8e45917fce convert: fix builtin cvsps under Windows
Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.
2008-10-13 17:31:03 +01:00
Matt Mackall
c44a262dd5 inotify: add a test for lookup bug 2008-10-10 12:08:49 -05:00
Matt Mackall
84505139dc inotify: skip deactivation message 2008-10-10 11:29:57 -05:00
Patrick Mezard
0d0f719f13 tests: Windows compatibility fixes
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
  test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
2008-10-12 19:11:59 +02:00
Patrick Mezard
e82fd2d627 Merge with crew-stable 2008-10-12 19:11:56 +02:00
Patrick Mezard
f8f73e46ef Merge with crew-stable 2008-10-10 13:20:40 +02:00
Patrick Mezard
e8a232c5c8 Show added files as "added" in editor commit message (issue 1330) 2008-10-09 14:16:17 +02:00
Alexander Solovyov
dfa7272d1d churn and stats commands merged 2008-10-09 00:14:20 +03:00
Matt Mackall
48ebb7a1ba merge: fix bug going backwards for already reverted files (issue1303) 2008-10-08 16:22:08 -05:00
Alexander Solovyov
0d41308ed2 churn: generalisation, now it is possible to see statistics grouped by custom template 2008-10-03 00:07:38 +03:00
Sune Foldager
9b5eac039b provide nicer feedback when an unknown node id is passed to a command
Previously, an unknown node id would lead to the following error:
abort: 00changelog.i@343445453433: no node!

All other unknown revision would instead display as:
abort: unknown revision '343445453'!

The former error message has been suppressed in favor of the latter.
2008-10-04 10:14:39 +02:00
Dirkjan Ochtman
1fde4bfba1 tests: check for bzr support by importing bzrlib
This is better than starting bzr --version, because it works correctly when
running tests with a non-default Python (version).
2008-10-02 16:22:02 +02:00
Benoit Boissinot
6866fd146e source doesn't work for some /bin/sh, use . instead 2008-09-29 12:12:53 +02:00
Patrick Mezard
4813e1621f get-with-headers: fix stream modes under Windows 2008-09-28 20:40:38 +02:00
Marek Kubica
0f790a60a5 convert: add bzr source 2008-09-26 20:33:47 +02:00
Dirkjan Ochtman
ba6b67f951 merge with crew-stable 2008-09-24 13:50:29 +02:00
Sune Foldager
1465c20864 fetch: use dirstate branch instead of first parents 2008-09-24 13:22:11 +02:00
Benoit Boissinot
66c79ea6b0 merge with -stable 2008-09-22 14:47:21 +02:00
Patrick Mezard
9b11dbf5dd Update coverage.py
There is no technical reason to update it except it contains all the patches
already done in mercurial plus other stuff. It will be easier to update and
maintain in the future.
2008-09-17 22:15:36 +02:00
Dirkjan Ochtman
0aa08a7ed8 merge with crew-stable 2008-09-17 11:34:37 +02:00
Rocco Rutte
f70a5a0f4e hgweb: Respond with HTTP 403 for disabled archive types instead of 404
This makes it easier for clients/users to distinct between supported
but disabled and unsupported archive types.
2008-09-05 17:28:37 +02:00
Benoit Boissinot
9ceefedcef merge with -stable 2008-09-10 23:20:04 +02:00
Benoit Boissinot
54526438a0 make test-mq-qdelete work reliably (issue1180)
if after a and b has been applied, their hash starts with c, then the test
would fail (because there would be a rev c which would be seen as "applied")
so probability of failure would be 2*1/16.
2008-09-10 17:55:49 +02:00
Benoit Boissinot
1dcbb85da7 run-tests.py: fix the check for the hg installation with -jn (n > 1) 2008-09-10 13:52:33 +02:00
Benoit Boissinot
401371bd20 merge backout 2008-09-10 08:49:05 +02:00
Benoit Boissinot
f4db28e2cc Backed out changeset 1aa58165fc81 (see issue916 for details) 2008-09-10 08:48:23 +02:00
Benoit Boissinot
7ba2d57a89 Do not try to load extensions twice (issue811) 2008-09-09 14:43:12 +02:00
Benoit Boissinot
416e5f2ef9 tag: without a checkout, base the tag changeset on tip instead of nullid
issue916
2008-09-08 14:04:10 +02:00
Sune Foldager
71dc05b36f fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
2008-09-08 12:55:46 +02:00
Sune Foldager
20edf348ee branch: added more support for named branches
hg branch now has a -C (--clean) option, to reset the current (dirstate)
branch to the branch of the last commit (first parent).
2008-09-08 12:55:27 +02:00
Martin Geisler
ca8bba4890 do not pretend to lock static-http repositories (issue994) 2008-09-08 11:32:53 +02:00
Benoit Boissinot
ebcbcef11c merge with -stable 2008-09-06 17:04:01 +02:00
Benoit Boissinot
ba9e79c7be merge with crew 2008-09-05 11:04:36 +02:00
Benoit Boissinot
0156251424 merge with -stable 2008-09-05 11:03:34 +02:00
Dirkjan Ochtman
051db6ab82 merge with crew-stable 2008-09-03 19:03:57 +02:00
Benoit Boissinot
20fc9c8d79 allow committing a removed directory
fix issue1089
2008-09-03 02:27:25 +02:00
Patrick Mezard
94ead662e7 convert: document source and sink identifiers, fix error message 2008-09-02 22:21:19 +02:00
Rocco Rutte
cc79439de6 highlight: only pygmentize for HTML mimetypes
For non-html mimetypes it doesn't make much sense. This also fixes the
issue that highlight unconditionally adds a <link/> tag for its CSS to
the template's header (which is pointless in text/plain output).
2008-09-05 10:39:57 +02:00
Patrick Mezard
20286160ce Merge with crew-stable 2008-09-02 09:47:40 +02:00
Benoit Boissinot
a45e96bda8 fix test output broken by 3268cb531b33 2008-09-02 01:19:12 +02:00
Martin Geisler
897f1ddab8 i18n: avoid naive plural tricks 2008-08-31 16:12:02 +02:00
Adrian Buehlmann
c937a43696 increase code coverage of test-clone
* add a non-inlined filelog to the test repo
* add 'clone --pull' test case
2008-08-30 18:47:54 +02:00
Dirkjan Ochtman
0c1845ffb9 hgweb: return content iterator instead of using write() callable
This is a new version of b6b16fec2a60 (which was backed out in faf83e1e40f5),
with an extra line removed to fix problems with hg serve. hg's internal web
server contains checking if the app isn't trying to write more bytes than
specified by the Content-Length header. The first try still contained an old
line that wrote the response, so the response was sent twice.
2008-08-30 17:13:23 +02:00
Benoit Boissinot
5562ddda56 fix regression on empty repo cloning introduced by d87e43563bf4
The store directory wasn't copied. Unconditionally create the directories
instead.
2008-08-29 16:50:11 +02:00
Martin Geisler
73f6ec8db1 qimport: report filename in case of IOError
The old behaviour was to say "abort: unable to read" since the
patchname variable was always None.
2008-08-26 00:04:18 +02:00
Stefano Tortarolo
2892a4755b Fix wrong redirection in test-rebase-parameters 2008-08-27 12:49:39 +02:00
Patrick Mezard
f0168e36a9 Merge with Gilles Moris 2008-08-24 22:40:34 +02:00
Gilles Moris
5d85996f85 Have verbose and debug flag print the changeset rev and hash when committing.
Besides updating the tests output, I had to push back at the end the test for
issue1193 in test-commit, solved by cset 31a0a36d6d95, because it was using the
current date for commit and was randomizing the subsequent hash.
2008-08-22 22:32:53 +02:00
Patrick Mezard
a8ac103268 Backed out changeset 0f390189b058
Replace this change with a better one.
2008-08-24 22:13:39 +02:00
Gilles Moris
4c144a2f64 Have verbose flag print the changeset hash when committing 2008-08-22 13:25:35 +02:00
Patrick Mezard
aee5d531f1 test-rebase-mq: '|' is a GNU sed extension, unfold it 2008-08-24 19:24:47 +02:00
Christian Ebert
ef7b051c64 keyword: avoid additional conflicts during merge/resolve
Make merge and resolve trigger kwtemplater.restricted to compare
data without keyword expansion.
The keyword stays outside the conflict:

$Keyword$
<<<<<<< local
bar
=======
foo
>>>>>>> other

and will again be expanded on commit.
Demonstrate in test case.
2008-08-22 08:26:18 +02:00
Dirkjan Ochtman
c29fabfbde merge with crew-stable 2008-08-21 19:05:18 +02:00
Christian Ebert
a72d3adc8a keyword: thorough hgweb testing
- test hgweb while keyword extension is _enabled_
- check expansion with hgweb.file
- besides log and diff, also check annotate for not expanding
2008-08-21 10:20:44 +02:00
Dirkjan Ochtman
3e077a5422 strip trailing whitespace, replace tabs by spaces 2008-08-21 11:35:17 +02:00
Dirkjan Ochtman
afa3084f5f hgweb: fix WSGI iterators handling in CGI adapter (issue1254) 2008-08-21 10:55:24 +02:00
Thomas Arendsen Hein
dd28190592 merge with crew-stable 2008-08-20 19:00:39 +02:00
Thomas Arendsen Hein
f8baf69ea4 merge with crew-stable 2008-08-20 15:05:43 +02:00
Maxim Dounin
1ce305a01e addremove: correctly handle intermediate symlinks
This fixes problems mentioned in issue660 comments (unrelated to original
issue) where directory was renamed, and symlink was added instead.
In such situation addremove wasn't able to correctly detect that old files
no longer here, but tried to add symlink (and failed due collision with
old files).
2008-05-07 14:32:00 +04:00
Patrick Mezard
574f71dd66 test-mq-qrename: test added patch renaming 2008-06-06 18:23:33 +02:00
Dirkjan Ochtman
ff7fe64e1f mq: don't update the working copy on strip if parents aren't stripped
* * *
2008-06-03 12:10:14 +02:00
Patrick Mezard
ea981a320c test-convert-mtn: test descriptions with quotes 2008-06-02 21:38:52 +02:00
Stefano Tortarolo
826bd6dc17 Active branches fix (issue1104) 2008-05-29 22:21:29 +02:00