Mercurial
Mercurial
>
hg-stable
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
help
less
more
|
(0)
-30000
-10000
-3000
-1000
-300
-100
-60
+60
+100
+300
+1000
+3000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
The revision graph only works with JavaScript-enabled browsers.
update: set custom conflict label for base commit
2022-01-18, by Martin von Zweigbergk
merge: set custom conflict label for base commit
2022-01-18, by Martin von Zweigbergk
rebase: set custom conflict label for base commit
2022-01-18, by Martin von Zweigbergk
simplemerge: take over formatting of label from `filemerge`
2022-01-20, by Martin von Zweigbergk
filemerge: pass `simplemerge.MergeInput` to tool functions
2022-01-20, by Martin von Zweigbergk
filemerge: work with `simplemerge.MergeInput` in `filemerge()`
2022-01-20, by Martin von Zweigbergk
filemerge: always define a "base" label
2022-01-20, by Martin von Zweigbergk
filemerge: set default labels a little earlier
2022-01-20, by Martin von Zweigbergk
filemerge: remove unused arguments from `_merge()`
2022-01-20, by Martin von Zweigbergk
simplemerge: take arguments as annotated context objects
2022-01-20, by Martin von Zweigbergk
filemerge: make `labels` a required arg for `_premerge()`
2022-01-20, by Martin von Zweigbergk
filemerge: remove unnecessary check for empty string
2022-01-20, by Martin von Zweigbergk
tests: also test spaces in conflict marker labels
2022-01-20, by Martin von Zweigbergk
blackbox: change year in logs to ISO 8601 format
2022-01-17, by Valentin Gatien-Baron
blackbox: add milliseconds to blackbox logs by default
2022-01-17, by Valentin Gatien-Baron
blackbox: correct date format doc
2022-01-17, by Valentin Gatien-Baron
branching: merge with stable
2022-01-18, by Raphaël Gomès
rust: Fix outdated comments in OwningDirstateMap
2022-01-17, by Simon Sapin
merge: consider the file merged when using :merge-{local,other}
2022-01-14, by Martin von Zweigbergk
simplemerge: delete unused exception class `CantReprocessAndShowBase`
2022-01-14, by Martin von Zweigbergk
simplemerge: change _minimize() to minimize a single conflict
2022-01-11, by Martin von Zweigbergk
simplemerge: make minimize() a free function
2022-01-11, by Martin von Zweigbergk
simplemerge: simplify and rename `render_markers()`
2022-01-11, by Martin von Zweigbergk
simplemerge: split out function for rendering :merge3 conflict markers
2022-01-11, by Martin von Zweigbergk
simplemerge: move default labels to simplemerge extension
2022-01-07, by Martin von Zweigbergk
simplemerge: use same newline detection for :mergediff as for :merge[3]
2022-01-07, by Martin von Zweigbergk
simplemerge: clarify names of functions that render conflict markers
2022-01-11, by Martin von Zweigbergk
simplemerge: make merge_lines() a free function
2022-01-07, by Martin von Zweigbergk
simplemerge: convert `merge_lines()` away from generator
2022-01-07, by Martin von Zweigbergk
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
2021-12-14, by Martin von Zweigbergk
rust: upgrade `rand*` crates
2022-01-14, by Martin von Zweigbergk
logcmdutil: raise `StateError` when file to follow doesn't exist
2022-01-06, by Martin von Zweigbergk
logcmdutil: raise `InputError` on bad CLI arguments
2022-01-06, by Martin von Zweigbergk
tests: support pygments 2.11 (issue6628)
2022-01-09, by Cédric Krier
exchange: add fast path for subrepo check on push
2022-01-03, by Joerg Sonnenberger
simplemerge: rewrite `merge_lines()` using `merge_groups()`
2022-01-05, by Martin von Zweigbergk
simplemerge: make merge_groups() yield only 2-tuples
2022-01-06, by Martin von Zweigbergk
rhg: desambiguate status without decompressing filelog if possible
2022-01-07, by Simon Sapin
filelog: add a comment explaining a fast path in filerevisioncopied()
2022-01-06, by Simon Sapin
rhg: Store p1, p2, and hash in RevlogEntry
2021-12-21, by Simon Sapin
rhg: RevlogEntry::uncompressed_len is signed
2021-12-21, by Simon Sapin
rhg: Expose FilelogEntry that wraps RevlogEntry
2021-12-21, by Simon Sapin
rhg: Add RevlogEntry::data that does delta resolution
2021-12-21, by Simon Sapin
rhg: Rename some revlog-related types and methods
2021-12-21, by Simon Sapin
git: add opener attribute to gitstore
2022-01-05, by Augie Fackler
branching: merge stable into default
2022-01-06, by Raphaël Gomès
dirstate: remove deprecated API
2021-12-23, by Raphaël Gomès
discovery: remove deprecated API
2021-12-23, by Raphaël Gomès
revlog: remove deprecated APIs
2021-12-23, by Raphaël Gomès
urls: remove deprecated APIs
2021-12-23, by Raphaël Gomès
remotefilelog: remove deprecated API
2021-12-23, by Raphaël Gomès
exchangev2: remove it
2021-12-07, by Raphaël Gomès
rust: fix build errors on darwin
2021-12-30, by Dan Villiom Podlaski Christiansen
merge: with stable
2022-01-04, by Augie Fackler
help: properly document the default pattern
2019-02-15, by Jordi Gutiérrez Hermoso
hg-core: dedup LazyAncestors Iterator impl
2021-12-10, by pacien
hg-cpython: use ancestor iterator impls from vcsgraph
2021-11-16, by pacien
hg-cpython: implement vcsgraph::Graph for our Index
2021-12-10, by pacien
rust: add vcsgraph crate as dependency
2021-12-10, by pacien
simplemerge: don't calculate conflict labels when resolving automatically
2021-12-07, by Martin von Zweigbergk
less
more
|
(0)
-30000
-10000
-3000
-1000
-300
-100
-60
+60
+100
+300
+1000
+3000
tip