tests/test-mq-qrefresh-interactive.t
author Patrick Mezard <pmezard@gmail.com>
Mon, 01 Aug 2011 23:58:50 +0200
branchstable
changeset 15005 4a43e23b8c55
parent 14426 1df64ccef23e
child 15145 ff26712a0c50
permissions -rw-r--r--
hgweb: do not ignore [auth] if url has a username (issue2822) The [auth] section was ignored when handling URLs like: http://user@example.com/foo Instead, we look in [auth] for an entry matching the URL and supplied user name. Entries without username can match URL with a username. Prefix length ties are resolved in favor of entries matching the username. With: foo.prefix = http://example.org foo.username = user foo.password = password bar.prefix = http://example.org/bar and the input URL: http://user@example.org/bar the 'bar' entry will be selected because of prefix length, therefore prompting for a password. This behaviour ensure that entries selection is consistent when looking for credentials or for certificates, and that certificates can be picked even if their entries do no define usernames while the URL does. Additionally, entries without a username matched against a username are returned as if they did have requested username set to avoid prompting again for a username if the password is not set. v2: reparse the URL in readauthforuri() to handle HTTP and HTTPS similarly. v3: allow unset usernames to match URL usernames to pick certificates. Resolve prefix length ties in favor of entries with usernames.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14426
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     1
Create configuration
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     3
  $ echo "[ui]" >> $HGRCPATH
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     4
  $ echo "interactive=true" >> $HGRCPATH
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     6
help qrefresh (no record)
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     7
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     8
  $ echo "[extensions]" >> $HGRCPATH
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
     9
  $ echo "mq=" >> $HGRCPATH
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    10
  $ hg help qrefresh
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    11
  hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    12
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    13
  update the current patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    14
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    15
      If any file patterns are provided, the refreshed patch will contain only
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    16
      the modifications that match those patterns; the remaining modifications
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    17
      will remain in the working directory.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    18
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    19
      If -s/--short is specified, files currently included in the patch will be
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    20
      refreshed just like matched files and remain in the patch.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    21
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    22
      If -e/--edit is specified, Mercurial will start your configured editor for
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    23
      you to enter a message. In case qrefresh fails, you will find a backup of
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    24
      your message in ".hg/last-message.txt".
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    25
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    26
      hg add/remove/copy/rename work as usual, though you might want to use git-
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    27
      style patches (-g/--git or [diff] git=1) to track copies and renames. See
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    28
      the diffs help topic for more information on the git diff format.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    29
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    30
      Returns 0 on success.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    31
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    32
  options:
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    33
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    34
   -e --edit                 edit commit message
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    35
   -g --git                  use git extended diff format
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    36
   -s --short                refresh only files already in the patch and
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    37
                             specified files
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    38
   -U --currentuser          add/update author field in patch with current user
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    39
   -u --user USER            add/update author field in patch with given user
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    40
   -D --currentdate          add/update date field in patch with current date
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    41
   -d --date DATE            add/update date field in patch with given date
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    42
   -I --include PATTERN [+]  include names matching the given patterns
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    43
   -X --exclude PATTERN [+]  exclude names matching the given patterns
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    44
   -m --message TEXT         use text as commit message
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    45
   -l --logfile FILE         read commit message from file
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    46
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    47
  [+] marked option can be specified multiple times
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    48
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    49
  use "hg -v help qrefresh" to show global options
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    50
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    51
help qrefresh (record)
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    52
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    53
  $ echo "record=" >> $HGRCPATH
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    54
  $ hg help qrefresh
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    55
  hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    56
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    57
  update the current patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    58
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    59
      If any file patterns are provided, the refreshed patch will contain only
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    60
      the modifications that match those patterns; the remaining modifications
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    61
      will remain in the working directory.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    62
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    63
      If -s/--short is specified, files currently included in the patch will be
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    64
      refreshed just like matched files and remain in the patch.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    65
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    66
      If -e/--edit is specified, Mercurial will start your configured editor for
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    67
      you to enter a message. In case qrefresh fails, you will find a backup of
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    68
      your message in ".hg/last-message.txt".
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    69
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    70
      hg add/remove/copy/rename work as usual, though you might want to use git-
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    71
      style patches (-g/--git or [diff] git=1) to track copies and renames. See
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    72
      the diffs help topic for more information on the git diff format.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    73
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    74
      Returns 0 on success.
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    75
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    76
  options:
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    77
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    78
   -e --edit                 edit commit message
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    79
   -g --git                  use git extended diff format
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    80
   -s --short                refresh only files already in the patch and
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    81
                             specified files
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    82
   -U --currentuser          add/update author field in patch with current user
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    83
   -u --user USER            add/update author field in patch with given user
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    84
   -D --currentdate          add/update date field in patch with current date
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    85
   -d --date DATE            add/update date field in patch with given date
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    86
   -I --include PATTERN [+]  include names matching the given patterns
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    87
   -X --exclude PATTERN [+]  exclude names matching the given patterns
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    88
   -m --message TEXT         use text as commit message
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    89
   -l --logfile FILE         read commit message from file
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    90
   -i --interactive          interactively select changes to refresh
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    91
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    92
  [+] marked option can be specified multiple times
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    93
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    94
  use "hg -v help qrefresh" to show global options
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    95
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    96
  $ hg init a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    97
  $ cd a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    98
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
    99
Base commit
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   100
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   101
  $ cat > 1.txt <<EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   102
  > 1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   103
  > 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   104
  > 3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   105
  > 4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   106
  > 5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   107
  > EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   108
  $ cat > 2.txt <<EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   109
  > a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   110
  > b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   111
  > c
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   112
  > d
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   113
  > e
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   114
  > f
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   115
  > EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   116
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   117
  $ mkdir dir
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   118
  $ cat > dir/a.txt <<EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   119
  > hello world
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   120
  > 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   121
  > someone
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   122
  > up
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   123
  > there
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   124
  > loves
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   125
  > me
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   126
  > EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   127
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   128
  $ hg add 1.txt 2.txt dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   129
  $ hg commit -m aaa
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   130
  $ hg qnew -d '0 0' patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   131
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   132
Changing files
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   133
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   134
  $ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   135
  $ sed -e 's/b/b b/' 2.txt > 2.txt.new
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   136
  $ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   137
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   138
  $ mv -f 1.txt.new 1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   139
  $ mv -f 2.txt.new 2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   140
  $ mv -f dir/a.txt.new dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   141
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   142
Whole diff
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   143
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   144
  $ hg diff --nodates
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   145
  diff -r ed27675cb5df 1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   146
  --- a/1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   147
  +++ b/1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   148
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   149
   1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   150
  -2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   151
  +2 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   152
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   153
  -4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   154
  +4 4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   155
   5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   156
  diff -r ed27675cb5df 2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   157
  --- a/2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   158
  +++ b/2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   159
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   160
   a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   161
  -b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   162
  +b b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   163
   c
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   164
   d
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   165
   e
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   166
  diff -r ed27675cb5df dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   167
  --- a/dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   168
  +++ b/dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   169
  @@ -1,4 +1,4 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   170
  -hello world
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   171
  +hello world!
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   172
   
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   173
   someone
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   174
   up
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   175
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   176
partial qrefresh
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   177
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   178
  $ hg qrefresh -i -d '0 0' <<EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   179
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   180
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   181
  > n
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   182
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   183
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   184
  > n
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   185
  > EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   186
  diff --git a/1.txt b/1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   187
  2 hunks, 2 lines changed
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   188
  examine changes to '1.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   189
  @@ -1,3 +1,3 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   190
   1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   191
  -2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   192
  +2 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   193
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   194
  record change 1/4 to '1.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   195
  @@ -3,3 +3,3 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   196
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   197
  -4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   198
  +4 4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   199
   5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   200
  record change 2/4 to '1.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   201
  diff --git a/2.txt b/2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   202
  1 hunks, 1 lines changed
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   203
  examine changes to '2.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   204
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   205
   a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   206
  -b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   207
  +b b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   208
   c
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   209
   d
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   210
   e
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   211
  record change 3/4 to '2.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   212
  diff --git a/dir/a.txt b/dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   213
  1 hunks, 1 lines changed
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   214
  examine changes to 'dir/a.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   215
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   216
After partial qrefresh 'tip'
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   217
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   218
  $ hg tip -p
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   219
  changeset:   1:0738af1a8211
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   220
  tag:         patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   221
  tag:         qbase
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   222
  tag:         qtip
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   223
  tag:         tip
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   224
  user:        test
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   225
  date:        Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   226
  summary:     [mq]: patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   227
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   228
  diff -r 1fd39ab63a33 -r 0738af1a8211 1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   229
  --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   230
  +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   231
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   232
   1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   233
  -2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   234
  +2 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   235
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   236
   4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   237
   5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   238
  diff -r 1fd39ab63a33 -r 0738af1a8211 2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   239
  --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   240
  +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   241
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   242
   a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   243
  -b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   244
  +b b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   245
   c
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   246
   d
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   247
   e
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   248
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   249
After partial qrefresh 'diff'
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   250
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   251
  $ hg diff --nodates
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   252
  diff -r 0738af1a8211 1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   253
  --- a/1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   254
  +++ b/1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   255
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   256
   1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   257
   2 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   258
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   259
  -4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   260
  +4 4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   261
   5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   262
  diff -r 0738af1a8211 dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   263
  --- a/dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   264
  +++ b/dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   265
  @@ -1,4 +1,4 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   266
  -hello world
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   267
  +hello world!
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   268
   
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   269
   someone
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   270
   up
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   271
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   272
qrefresh interactively everything else
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   273
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   274
  $ hg qrefresh -i -d '0 0' <<EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   275
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   276
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   277
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   278
  > y
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   279
  > EOF
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   280
  diff --git a/1.txt b/1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   281
  1 hunks, 1 lines changed
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   282
  examine changes to '1.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   283
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   284
   1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   285
   2 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   286
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   287
  -4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   288
  +4 4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   289
   5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   290
  record change 1/2 to '1.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   291
  diff --git a/dir/a.txt b/dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   292
  1 hunks, 1 lines changed
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   293
  examine changes to 'dir/a.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   294
  @@ -1,4 +1,4 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   295
  -hello world
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   296
  +hello world!
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   297
   
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   298
   someone
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   299
   up
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   300
  record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] 
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   301
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   302
After final qrefresh 'tip'
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   303
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   304
  $ hg tip -p
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   305
  changeset:   1:2c3f66afeed9
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   306
  tag:         patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   307
  tag:         qbase
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   308
  tag:         qtip
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   309
  tag:         tip
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   310
  user:        test
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   311
  date:        Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   312
  summary:     [mq]: patch
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   313
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   314
  diff -r 1fd39ab63a33 -r 2c3f66afeed9 1.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   315
  --- a/1.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   316
  +++ b/1.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   317
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   318
   1
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   319
  -2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   320
  +2 2
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   321
   3
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   322
  -4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   323
  +4 4
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   324
   5
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   325
  diff -r 1fd39ab63a33 -r 2c3f66afeed9 2.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   326
  --- a/2.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   327
  +++ b/2.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   328
  @@ -1,5 +1,5 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   329
   a
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   330
  -b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   331
  +b b
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   332
   c
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   333
   d
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   334
   e
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   335
  diff -r 1fd39ab63a33 -r 2c3f66afeed9 dir/a.txt
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   336
  --- a/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   337
  +++ b/dir/a.txt	Thu Jan 01 00:00:00 1970 +0000
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   338
  @@ -1,4 +1,4 @@
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   339
  -hello world
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   340
  +hello world!
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   341
   
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   342
   someone
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   343
   up
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   344
  
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   345
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   346
After qrefresh 'diff'
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   347
1df64ccef23e record: add qrefresh -i/--interactive
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
   348
  $ hg diff --nodates