upstream/mercurial-mirror Files · tests/test-rebase-check-restore.t

url: Remove the proxy env variables only when needed (issue2451)...

url: Remove the proxy env variables only when needed (issue2451) This is an attempt to fix issue 2451 and its duplicates (2599 and 2949, AFAIK). Its main idea is that it is only necessary to clean the proxy environment variables *when* http_proxy is set in the config file (since it takes precedence over the environment variables). Otherwise, hg shouldn't bother with them, since they will most likely be used to reach the server.

Steve Borho - - Load All Authors

File last commit:

r12896:b19b4c1d stable


                r15077:02734d2b

stable

Download file

             test-rebase-check-restore.t
        
                    142 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rebase-check-restore.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > graphlog=

        > rebase=

        > 

        > [alias]

        > tglog = log -G --template "{rev}: '{desc}' {branches}\n"

        > EOF

        $ hg init a

        $ cd a

        $ echo A > A

        $ hg add A

        $ hg ci -m A

        $ echo 'B' > B

        $ hg add B

        $ hg ci -m B

        $ echo C >> A

        $ hg ci -m C

        $ hg up -q -C 0

        $ echo D >> A

        $ hg ci -m D

        created new head

        $ echo E > E

        $ hg add E

        $ hg ci -m E

        $ hg up -q -C 0

        $ hg branch 'notdefault'

        marked working directory as branch notdefault

        $ echo F >> A

        $ hg ci -m F

        $ cd ..

      Rebasing B onto E - check keep:

        $ hg clone -q -u . a a1

        $ cd a1

        $ hg tglog

        @  5: 'F' notdefault

        |

        | o  4: 'E'

        | |

        | o  3: 'D'

        |/

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -s 1 -d 4 --keep

        merging A

        warning: conflicts during merge.

        merging A failed!

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        $ hg rebase --continue

        $ hg tglog

        @  7: 'C'

        |

        o  6: 'B'

        |

        | o  5: 'F' notdefault

        | |

        o |  4: 'E'

        | |

        o |  3: 'D'

        |/

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

        $ cd ..

      Rebase F onto E - check keepbranches:

        $ hg clone -q -u . a a2

        $ cd a2

        $ hg tglog

        @  5: 'F' notdefault

        |

        | o  4: 'E'

        | |

        | o  3: 'D'

        |/

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

        $ hg rebase -s 5 -d 4 --keepbranches

        merging A

        warning: conflicts during merge.

        merging A failed!

        abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

        [255]

      Solve the conflict and go on:

        $ echo 'conflict solved' > A

        $ rm A.orig

        $ hg resolve -m A

        $ hg rebase --continue

        saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

        $ hg tglog

        @  5: 'F' notdefault

        |

        o  4: 'E'

        |

        o  3: 'D'

        |

        | o  2: 'C'

        | |

        | o  1: 'B'

        |/

        o  0: 'A'

	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

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> graphlog=
				> rebase=
				>
				> [alias]
				> tglog = log -G --template "{rev}: '{desc}' {branches}\n"
				> EOF


				$ hg init a
				$ cd a

				$ echo A > A
				$ hg add A
				$ hg ci -m A

				$ echo 'B' > B
				$ hg add B
				$ hg ci -m B

				$ echo C >> A
				$ hg ci -m C

				$ hg up -q -C 0

				$ echo D >> A
				$ hg ci -m D
				created new head

				$ echo E > E
				$ hg add E
				$ hg ci -m E

				$ hg up -q -C 0

				$ hg branch 'notdefault'
				marked working directory as branch notdefault
				$ echo F >> A
				$ hg ci -m F

				$ cd ..


				Rebasing B onto E - check keep:

				$ hg clone -q -u . a a1
				$ cd a1

				$ hg tglog
				@ 5: 'F' notdefault
				\|
				\| o 4: 'E'
				\| \|
				\| o 3: 'D'
				\|/
				\| o 2: 'C'
				\| \|
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ hg rebase -s 1 -d 4 --keep
				merging A
				warning: conflicts during merge.
				merging A failed!
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				$ hg rebase --continue

				$ hg tglog
				@ 7: 'C'
				\|
				o 6: 'B'
				\|
				\| o 5: 'F' notdefault
				\| \|
				o \| 4: 'E'
				\| \|
				o \| 3: 'D'
				\|/
				\| o 2: 'C'
				\| \|
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ cd ..


				Rebase F onto E - check keepbranches:

				$ hg clone -q -u . a a2
				$ cd a2

				$ hg tglog
				@ 5: 'F' notdefault
				\|
				\| o 4: 'E'
				\| \|
				\| o 3: 'D'
				\|/
				\| o 2: 'C'
				\| \|
				\| o 1: 'B'
				\|/
				o 0: 'A'

				$ hg rebase -s 5 -d 4 --keepbranches
				merging A
				warning: conflicts during merge.
				merging A failed!
				abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
				[255]

				Solve the conflict and go on:

				$ echo 'conflict solved' > A
				$ rm A.orig
				$ hg resolve -m A
				$ hg rebase --continue
				saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)

				$ hg tglog
				@ 5: 'F' notdefault
				\|
				o 4: 'E'
				\|
				o 3: 'D'
				\|
				\| o 2: 'C'
				\| \|
				\| o 1: 'B'
				\|/
				o 0: 'A'