upstream/mercurial-mirror Files · tests/test-diff-subdir.t

bookmarks: pull --update updates to active bookmark if it moved (issue4007)...

bookmarks: pull --update updates to active bookmark if it moved (issue4007) This makes `hg pull --update` behave the same wrt the active bookmark as `hg pull && hg update` does as of 2096e025a728. A helper function, bookmarks.calculateupdate, is added to prevent code duplication between postincoming and update.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r19523:f37b5a17

2.7 stable

Download file

             test-diff-subdir.t
        
                    47 lines
            
             | 675 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-subdir.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ mkdir alpha

        $ touch alpha/one

        $ mkdir beta

        $ touch beta/two

        $ hg add alpha/one beta/two

        $ hg ci -m "start"

        $ echo 1 > alpha/one

        $ echo 2 > beta/two

      everything

        $ hg diff --nodates

        diff -r 7d5ef1aea329 alpha/one

        --- a/alpha/one

        +++ b/alpha/one

        @@ -0,0 +1,1 @@

        +1

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

      beta only

        $ hg diff --nodates beta

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

      inside beta

        $ cd beta

        $ hg diff --nodates .

        diff -r 7d5ef1aea329 beta/two

        --- a/beta/two

        +++ b/beta/two

        @@ -0,0 +1,1 @@

        +2

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				$ hg init

				$ mkdir alpha
				$ touch alpha/one
				$ mkdir beta
				$ touch beta/two

				$ hg add alpha/one beta/two
				$ hg ci -m "start"

				$ echo 1 > alpha/one
				$ echo 2 > beta/two

				everything

				$ hg diff --nodates
				diff -r 7d5ef1aea329 alpha/one
				--- a/alpha/one
				+++ b/alpha/one
				@@ -0,0 +1,1 @@
				+1
				diff -r 7d5ef1aea329 beta/two
				--- a/beta/two
				+++ b/beta/two
				@@ -0,0 +1,1 @@
				+2

				beta only

				$ hg diff --nodates beta
				diff -r 7d5ef1aea329 beta/two
				--- a/beta/two
				+++ b/beta/two
				@@ -0,0 +1,1 @@
				+2

				inside beta

				$ cd beta
				$ hg diff --nodates .
				diff -r 7d5ef1aea329 beta/two
				--- a/beta/two
				+++ b/beta/two
				@@ -0,0 +1,1 @@
				+2

				$ cd ..