Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/plan9/proto
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
Sat, 30 Apr 2016 18:39:39 +0200
branchstable
changeset 29044 261c25372959
parent 16489 cf137319c6cd
permissions -rw-r--r--
rebase: restrict rebase destination to the pulled set (issue5214) Before this patch, `hg pull --rebase` would be a strict sequence of `hg pull` followed by `hg rebase` if anything was pulled. Now that rebase pick his default destination the same way than merge, than `hg rebase` step would abort in the case the repo already had multiple anonymous heads (because of the ambiguity). (changed in fac3a24be50e) The intend of the user with `hg pull --rebase` is clearly to rebase on pulled content. This used to be (mostly) enforced by the former default destination for rebase, "tipmost changeset of the branch" as the tipmost would likely a changeset that just got pulled. But this intended was no longer enforced with the new defaul destination (unified with merge). This changeset makes use of the '_destspace' mechanism introduced in the previous changeset to enforce this. This partially fixes issue5214 as no change at all have been made to the new handling of the case with bookmark (unified with merge).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16383
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     1
 
lib	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     2
 
	mercurial	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     3
 
		hgrc.d	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     4
 
			9diff.rc	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     5
 
			factotum.rc	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     6
 
rc	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     7
 
	bin	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     8
 
		9diff	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
     9
 
		hg	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    10
 
sys	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    11
 
	lib	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    12
 
		python	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    13
 
			lib	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    14
 
				python2.5	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    15
 
					site-packages	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    16
 
						hgext	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    17
 
							+	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    18
 
						mercurial	- sys sys
f5dd179bfa4a plan9: initial support for plan 9 from bell labs
Steven Stallion <sstallion@gmail.com>
parents:
diff changeset 
    19
 
							+	- sys sys
16442
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset 
    20
 
						mercurial-VERSION-py2.5.egg-info	- sys sys
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset 
    21
 
	src	- sys sys
9181188ffb5b plan9: finalize documentation for next release
Steven Stallion <sstallion@gmail.com>
parents: 16383
diff changeset 
    22
 
		cmd	- sys sys
16489
cf137319c6cd plan9: add missing source entries to proto
Steven Stallion <sstallion@gmail.com>
parents: 16442
diff changeset 
    23
 
			hg	- sys sys
cf137319c6cd plan9: add missing source entries to proto
Steven Stallion <sstallion@gmail.com>
parents: 16442
diff changeset 
    24
 
				+	- sys sys
hg-stable