[Bug 4940] New: shelving in a shared workdir with shared bookmarks loses the active bookmark
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Nov 6 18:16:58 UTC 2015
https://bz.mercurial-scm.org/show_bug.cgi?id=4940
Bug ID: 4940
Summary: shelving in a shared workdir with shared bookmarks
loses the active bookmark
Product: Mercurial
Version: 3.5.2
Hardware: PC
OS: Windows
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: shelve
Assignee: bugzilla at selenic.com
Reporter: rm at fb.com
CC: mercurial-devel at selenic.com
Here is a patch to the shelve test that shows the issue
# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1446833756 28800
# Fri Nov 06 10:15:56 2015 -0800
# Node ID c37d0259750b3cb79a44d3d2e84e0bfccad15b03
# Parent f9984f76fd90e439221425d751e29bae17bec995
shelve bug 3
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -2,6 +2,7 @@
> [extensions]
> mq =
> shelve =
+ > share =
> [defaults]
> diff = --nodates --git
> qnew = --date '0 0'
@@ -1174,3 +1175,17 @@ Try again but with a corrupted shelve st
rebase aborted
$ hg up -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+Show that shelve + share loses bookmarks
+ $ cd ..
+ $ hg share -B repo share
+ updating working directory
+ 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cd share
+ $ hg book foo
+ $ echo x >> x
+ $ hg shelve
+ shelved as foo
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg book
+ test 4:33f7f61e6c5e
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list