bzr.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Thu, 08 Sep 2011 02:24:26 +0300
changeset 986 858ecbc30566
parent 787 442a4bcfc322
permissions -rw-r--r--
print long name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
584
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     1
-*- mode: outline -*-
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
     2
784
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     3
* Import existing/init new project.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     4
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     5
  $ mkdir proj
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     6
  $ cd proj
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     7
  $ touch README Makefile main.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     8
  $ bzr init
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
     9
Created a standalone tree (format: 2a)
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    10
  $ bzr add .
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    11
adding Makefile
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    12
adding README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    13
adding main.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    14
  $ bzr ci -m 'Init proj.'
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    15
Committing to: /cygdrive/e/home/devel/tmp/vcs-bzr/proj/
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    16
added Makefile
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    17
added README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    18
added main.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    19
Committed revision 1.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    20
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    21
* Cloning/branching repo.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    22
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    23
'branch'/'get'/'clone' are aliases for 'branch' command:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    24
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    25
  $ bzr clone proj/ proj-clone
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    26
Branched 1 revision(s).
584
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    27
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    28
* Updating repo.
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    29
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    30
* Incoming changes.
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    31
787
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    32
  $ bzr missing --theirs-only bzr://bzr.example.com/proj/trunk
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    33
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    34
* Outgoing changes.
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    35
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    36
  $ bzr st
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    37
modified:
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    38
  README
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    39
  $ bzr ci -m up
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    40
Committing to: /cygdrive/e/home/devel/tmp/vcs-bzr/proj-clone/
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    41
modified README
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    42
Committed revision 2.
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    43
  $ bzr missing --mine-only
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    44
Using saved parent location: /cygdrive/e/home/devel/tmp/vcs-bzr/proj/
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    45
You have 1 extra revision(s):
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    46
------------------------------------------------------------
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    47
revno: 2
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    48
committer: Oleksandr Gavenko <gavenkoa@gmail.com>
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    49
branch nick: proj-clone
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    50
timestamp: Mon 2011-01-24 00:21:27 +0200
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    51
message:
442a4bcfc322 Outgoing changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 786
diff changeset
    52
  up
584
f22a63473219 bzr incoming changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    53
784
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    54
* Working copy status.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    55
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    56
'status'/'st'/'stat' are aliases for 'status' command:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    57
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    58
  $ bzr rm README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    59
deleted README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    60
  $ bzr st
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    61
removed:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    62
  README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    63
785
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    64
* Show working copy diff.
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    65
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    66
  $ echo hello >README
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    67
  $ bzr diff
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    68
=== modified file 'README'
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    69
--- README  2011-01-23 21:16:40 +0000
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    70
+++ README  2011-01-23 21:37:47 +0000
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    71
@@ -0,0 +1,1 @@
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    72
+hello
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    73
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    74
* Show history log.
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    75
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    76
  $ bzr log
b3e487d65e5f Show working copy diff.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 784
diff changeset
    77
784
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    78
* Adding files to repo.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    79
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    80
  $ touch hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    81
  $ bzr add hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    82
adding hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    83
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    84
* Deleting files from repo.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    85
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    86
'remove'/'rm'/'del' are aliases for 'remove' command:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    87
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    88
  $ bzr rm README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    89
deleted README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    90
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    91
* Undo local changes.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    92
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    93
  $ bzr rm README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    94
deleted README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    95
  $ bzr revert README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    96
+N  README
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    97
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    98
* Undo last commit.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
    99
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   100
  $ bzr add hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   101
adding hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   102
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   103
  $ bzr ci -m bug
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   104
Committing to: /cygdrive/e/home/devel/tmp/vcs-bzr/proj-clone/
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   105
added hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   106
Committed revision 2.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   107
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   108
  $ bzr uncommit
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   109
Are you sure? [y/n]: y
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   110
    2 Oleksandr Gavenko	2011-01-23
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   111
      bug
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   112
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   113
The above revision(s) will be removed.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   114
You can restore the old tip by running:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   115
  bzr pull . -r revid:gavenkoa@gmail.com-20110123213425-f2ca8umip5iw73is
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   116
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   117
  $ bzr st
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   118
added:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   119
  hello.c
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   120
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   121
* Info about bzr repo.
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   122
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   123
  $ bzr info
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   124
Standalone tree (format: 2a)
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   125
Location:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   126
  branch root: .
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   127
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   128
Related branches:
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   129
  parent branch: /cygdrive/e/home/devel/tmp/vcs-bzr/proj
782bf40bb699 Simple bzr command.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 584
diff changeset
   130
786
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   131
* Shelf changes.
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   132
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   133
  $ bzr st
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   134
modified:
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   135
  README
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   136
  $ bzr shelve --all
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   137
Selected changes:
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   138
 M  README
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   139
Changes shelved with id "1".
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   140
  $ bzr diff
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   141
  $ bzr shelve --list
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   142
  1: <no message>
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   143
  $  bzr unshelve
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   144
Using changes with id "1".
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   145
 M  README
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   146
All changes applied successfully.
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   147
Deleted changes with id "1".
5534e42a0078 Shelf changes.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 785
diff changeset
   148