upstream/mercurial-mirror Files · tests/test-double-merge.t

identify: add template support...

identify: add template support This is based on a patch proposed last year by Mathias De Maré[1], with a few changes. - Tags and bookmarks are now formatted lists, for more flexible queries. - The templater is populated whether or not [-nibtB] is specified. (Plain output is unchanged.) This seems more consistent with other templated commands. - The 'id' property is a string, instead of a list. - The parents of 'wdir()' have their own list of attributes. I left 'id' as a string because it seems very useful for generating version info. It's also a bit strange because the value and meaning changes depending on whether or not --debug is passed (short vs full hash), whether the revision is a merge or not (one hash or two, separated by a '+'), the working directory or not (node vs p1node), and local or not (remote defaults to tip, and never has '+'). The equivalent string built with {rev} seems much less useful, and I couldn't think of a reasonable name, so I left it out. The discussion seemed to be pointing towards having a list of nodes, with more than one entry for a merge. It seems simpler to give the nodes a name, and use {node} for the actual commit probed, especially now that there is a virtual node for 'wdir()'. Yuya mentioned using fm.nested() in that thread, so I did for the parent nodes. I'm not sure if the plan is to fill in all of the context attributes in these items, or if these nested items should simply be made {p1node} and {p1rev}. I used ':' as the tag separator for consistency with {tags} in the log templater. Likewise, bookmarks are separated by a space for consistency with the corresponding log template. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-August/087039.html

Matt Harbison - - Load All Authors

File last commit:

r28318:564a354f default


                r33051:15a79ac8

default

Download file

             test-double-merge.t
        
                    66 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-double-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo line 1 > foo

        $ hg ci -qAm 'add foo'

      copy foo to bar and change both files

        $ hg cp foo bar

        $ echo line 2-1 >> foo

        $ echo line 2-2 >> bar

        $ hg ci -m 'cp foo bar; change both'

      in another branch, change foo in a way that doesn't conflict with

      the other changes

        $ hg up -qC 0

        $ echo line 0 > foo

        $ hg cat foo >> foo

        $ hg ci -m 'change foo'

        created new head

      we get conflicts that shouldn't be there

        $ hg merge -P

        changeset:   1:484bf6903104

        user:        test

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

        summary:     cp foo bar; change both

        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in other:

           bar

          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

           src: 'foo' -> dst: 'bar' *

          checking for directory renames

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104

         preserving foo for resolve of bar

         preserving foo for resolve of foo

        starting 4 threads for background file closing (?)

         bar: remote copied from foo -> m (premerge)

        picked tool ':merge' for bar (binary False symlink False changedelete False)

        merging foo and bar to bar

        my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc

         premerge successful

         foo: versions differ -> m (premerge)

        picked tool ':merge' for foo (binary False symlink False changedelete False)

        merging foo

        my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc

         premerge successful

        0 files updated, 2 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      contents of foo

        $ cat foo

        line 0

        line 1

        line 2-1

      contents of bar

        $ cat bar

        line 0

        line 1

        line 2-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 repo
				$ cd repo

				$ echo line 1 > foo
				$ hg ci -qAm 'add foo'

				copy foo to bar and change both files
				$ hg cp foo bar
				$ echo line 2-1 >> foo
				$ echo line 2-2 >> bar
				$ hg ci -m 'cp foo bar; change both'

				in another branch, change foo in a way that doesn't conflict with
				the other changes
				$ hg up -qC 0
				$ echo line 0 > foo
				$ hg cat foo >> foo
				$ hg ci -m 'change foo'
				created new head

				we get conflicts that shouldn't be there
				$ hg merge -P
				changeset: 1:484bf6903104
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: cp foo bar; change both

				$ hg merge --debug
				searching for copies back to rev 1
				unmatched files in other:
				bar
				all copies found (* = to merge, ! = divergent, % = renamed and deleted):
				src: 'foo' -> dst: 'bar' *
				checking for directory renames
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
				preserving foo for resolve of bar
				preserving foo for resolve of foo
				starting 4 threads for background file closing (?)
				bar: remote copied from foo -> m (premerge)
				picked tool ':merge' for bar (binary False symlink False changedelete False)
				merging foo and bar to bar
				my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
				premerge successful
				foo: versions differ -> m (premerge)
				picked tool ':merge' for foo (binary False symlink False changedelete False)
				merging foo
				my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
				premerge successful
				0 files updated, 2 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				contents of foo
				$ cat foo
				line 0
				line 1
				line 2-1

				contents of bar
				$ cat bar
				line 0
				line 1
				line 2-2

				$ cd ..