Mercurial Mercurial > mercurial / 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.
tests/test-issue1877.t
author Matt Harbison <matt_harbison@yahoo.com>
Tue, 06 Sep 2022 15:08:52 -0400
branchstable
changeset 49490 37debd850c16
parent 26420 2fc86d92c4a9
permissions -rw-r--r--
packaging: update dulwich to drop the certifi dependency on Windows The presence of `certifi` causes the system certificate store to be ignored, which was reported as a bug against TortoiseHg[1]. It was only pulled in on Windows because of `dulwich`, which was copied from the old TortoiseHg install scripts, in order to support `hg-git`. This version of `dulwich` raises the minimum `urllib3` to a version (1.25) that does certificate verification by default, without the help of `certifi`[2]. We already bundle a newer version of `urllib3`. Note that `certifi` can still be imported from the user site directory, if installed there. But the installer no longer disables the system certificates by default. [1] https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5825 [2] https://github.com/jelmer/dulwich/issues/1025
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26420
2fc86d92c4a9 urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents: 21404
diff changeset 
     1
 
https://bz.mercurial-scm.org/1877
13806
8ba08a16e4e0 bookmarks: do not forward merged bookmark (issue1877)
David Soria Parra <dsp@php.net>
parents:
diff changeset 
     2
 












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     3


  $ hg init a












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     4


  $ cd a












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     5


  $ echo a > a












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     6


  $ hg add a












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     7


  $ hg ci -m 'a'












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     8


  $ echo b > a












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




     9


  $ hg ci -m'b'












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    10


  $ hg up 0












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    11


  1 files updated, 0 files merged, 0 files removed, 0 files unresolved












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    12


  $ hg book main












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    13


  $ hg book












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    14


   * main                      0:cb9a9f314b8b












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    15


  $ echo c > c












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    16


  $ hg add c












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    17


  $ hg ci -m'c'












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    18


  created new head












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    19


  $ hg book












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    20


   * main                      2:d36c0562f908












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    21


  $ hg heads












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    22


  changeset:   2:d36c0562f908












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    23


  bookmark:    main












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    24


  tag:         tip












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    25


  parent:      0:cb9a9f314b8b












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    26


  user:        test












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    27


  date:        Thu Jan 01 00:00:00 1970 +0000












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    28


  summary:     c












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    29


  












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    30


  changeset:   1:1e6c11564562












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    31


  user:        test












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    32


  date:        Thu Jan 01 00:00:00 1970 +0000












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    33


  summary:     b












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    34


  












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    35


  $ hg up 1e6c11564562












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    36


  1 files updated, 0 files merged, 1 files removed, 0 files unresolved







21404






ca275f7ec576
update: when deactivating a bookmark, print a message



Siddharth Agarwal <sid0@fb.com>


parents: 
16913

diff
changeset




    37


  (leaving bookmark main)







13806






8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    38


  $ hg merge main












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    39


  1 files updated, 0 files merged, 0 files removed, 0 files unresolved












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    40


  (branch merge, don't forget to commit)












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    41


  $ hg book












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    42


     main                      2:d36c0562f908












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    43


  $ hg ci -m'merge'












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    44


  $ hg book












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    45


     main                      2:d36c0562f908












8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)



David Soria Parra <dsp@php.net>


parents: 

diff
changeset




    46









16913






f2719b387380
tests: add missing trailing 'cd ..'



Mads Kiilerich <mads@kiilerich.com>


parents: 
13806

diff
changeset




    47


  $ cd ..














mercurial