File: rprcs_session.log

package info (click to toggle)
prcs 1.2.15-6
  • links: PTS
  • area: main
  • in suites: potato
  • size: 2,928 kB
  • ctags: 3,129
  • sloc: cpp: 16,742; ansic: 5,725; sh: 2,545; lisp: 1,812; perl: 642; lex: 351; makefile: 165; pascal: 85
file content (251 lines) | stat: -rw-r--r-- 7,755 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
# --------
#
# example usage:
#	This example shows how to interact with a correctly setup remote 
#	repository. The merge at the end is done with a local repository
#	and is not (yet) possible with remote repositories (the resync
#	operation is just a first step towards this).
#	The checkin and checkout operations are functional.
#
# map two branches bar,foo from project foobar to a remote site
# add a file 'foobar' to the project
# at branch bar add some lines at the end
# at branch foo delete some lines
# (modifications done such that no conflicts are generated during merge)
# synchronize branches with local repo
# merge branches
#
# Actions performed in this order
#
# --------
#
# 1. map two branches to a remote site
#	in this example the remote sites are localhost and multicad.uia.ac.be
#	this means that the two sites are both local (same machine)
#	this should give no difference, but not tested for a while
#
#	the first action automatically sets up ~/RPRCS as local mapping 
#	database
#

<prcsuser@multicad> ~ $ rprcs branch -r bar -h localhost foobar
/home/prcsuser/bin/rprcs: Created rprcs database /home/prcsuser/RPRCS
/home/prcsuser/bin/rprcs: Mapping branch bar for project foobar to site localhost
<prcsuser@multicad> ~ $ rprcs branch -r foo -h multicad.uia.ac.be foobar
/home/prcsuser/bin/rprcs: Mapping branch foo for project foobar to site multicad.uia.ac.be

# --------
#
# 2. check out a mapped branch at the remote site
#	the remote branch didn't exist yet, it is created
#

<prcsuser@multicad> ~ $ rprcs checkout -r bar foobar
/home/prcsuser/bin/rprcs: Doing checkout for foobar on branch bar at localhost
cat prcs: Project not found in repository, initial checkout.
prcs: You may now edit the file `foobar.prj'.

# --------
#
# 3. add a file to the project and do a checkin on branch bar
#	rprcs populate is the same prcs populate
#

<prcsuser@multicad> ~ $ cat >foobar
line 1
line 2
line 3
line 4
line 5
<prcsuser@multicad> ~ $ rprcs checkin
/home/prcsuser/bin/rprcs: Doing checkin for foobar on branch bar
prcs: Created repository entry `foobar'.
prcs: Checking in project `foobar' version bar.1.
prcs: No modifications were found.  Aborting checkin.
<prcsuser@multicad> ~ $ rprcs populate foobar foobar
/home/prcsuser/bin/rprcs: populate for project foobar
prcs: One file was added.
<prcsuser@multicad> ~ $ rprcs checkin
/home/prcsuser/bin/rprcs: Doing checkin for foobar on branch bar
prcs: Checking in project `foobar' version bar.1.

# --------
#
# 4. edit the file and do checkin on branch foo
#	two lines deleted
#

<prcsuser@multicad> ~ $ cat >foobar
line 1
line 3
line 5
<prcsuser@multicad> ~ $ rprcs checkin -r foo
/home/prcsuser/bin/rprcs: Doing checkin for foobar on branch foo
prcs: No previous major version named `foo'.  Creating.
prcs: Checking in project `foobar' version foo.1.

# --------
#
# 5. edit the file and do checkin on branch foo
#	one more line delete
#

<prcsuser@multicad> ~ $ cat >foobar
line 1
line 5
<prcsuser@multicad> ~ $ rprcs checkin
/home/prcsuser/bin/rprcs: Doing checkin for foobar on branch foo
prcs: Checking in project `foobar' version foo.2.

# --------
#
# 6. modifications on branch bar
#	three lines appended
#

<prcsuser@multicad> ~ $ rprcs checkout -r bar
/home/prcsuser/bin/rprcs: Doing checkout for foobar on branch bar at localhost
prcs: Checkout project `foobar' version bar.1.
<prcsuser@multicad> ~ $ cat foobar 
line 1
line 2
line 3
line 4
line 5
<prcsuser@multicad> ~ $ cat >>foobar
line 6
line 7
line 8
<prcsuser@multicad> ~ $ cat foobar
line 1
line 2
line 3
line 4
line 5
line 6
line 7
line 8
<prcsuser@multicad> ~ $ rprcs checkin
/home/prcsuser/bin/rprcs: Doing checkin for foobar on branch bar
prcs: Checking in project `foobar' version bar.2.

# --------
#
# 7. resync branches bar with the local repo
#

<prcsuser@multicad> ~ $ rprcs resync -r bar foobar
/home/prcsuser/bin/rprcs: Default minor version resolved to 2
/home/prcsuser/bin/rprcs: importing branch bar for project foobar from localhost (total of 2 revisions for that branch)
/home/prcsuser/bin/rprcs: starting at foobar bar.2
prcs: Checkout project `foobar' version bar.2.
prcs: Checkout project `foobar' version bar.1.
Project branch ancestry at localhost : (-r bar.2 foobar -r bar.1 foobar)
prcs: Created repository `/home/prcsuser/PRCS', you may wish to run `prcs admin access' to set its permissions.
prcs: Created repository entry `foobar'.
prcs: Repository entry owner:  prcsuser
prcs: Repository entry group:  prcsuser
prcs: Repository entry access: 
prcs: Owner:                   read/write
prcs: Group:                   read/write
prcs: Other:                   read only
prcs: Project file `foobar.prj' already exists.  Replacing.
prcs: You may now edit the file `foobar.prj'.
prcs: Checkout project `foobar' version bar.1.
version : ( -r bar.1 foobar)
prcs: Checking in project `foobar' version bar.1.
prcs: Checkout project `foobar' version bar.1.
prcs: Project file `foobar.prj' already exists.  Replacing.
prcs: Checkout project `foobar' version bar.2.
version : ( -r bar.2 foobar)
prcs: Checking in project `foobar' version bar.2.

# --------
#
# 8. resync branch foo with the local repo
#	ancestry has one version at branch bar, that is just skipped
#

<prcsuser@multicad> ~ $ rprcs resync -r foo foobar
/home/prcsuser/bin/rprcs: Default minor version resolved to 2
/home/prcsuser/bin/rprcs: importing branch foo for project foobar from multicad.uia.ac.be (total of 2 revisions for that branch)
/home/prcsuser/bin/rprcs: starting at foobar foo.2
prcs: Checkout project `foobar' version foo.2.
prcs: Checkout project `foobar' version foo.1.
prcs: Checkout project `foobar' version bar.1.
Project branch ancestry at multicad.uia.ac.be : (-r foo.2 foobar -r foo.1 foobar -r bar.1 foobar)
prcs: Repository entry owner:  prcsuser
prcs: Repository entry group:  prcsuser
prcs: Repository entry access: 
prcs: Owner:                   read/write
prcs: Group:                   read/write
prcs: Other:                   read only
( -r bar.1 foobar) already in local repository
prcs: Checkout project `foobar' version bar.1.
prcs: Project file `foobar.prj' already exists.  Replacing.
prcs: Checkout project `foobar' version foo.1.
version : ( -r foo.1 foobar)
prcs: No previous major version named `foo'.  Creating.
prcs: Checking in project `foobar' version foo.1.
prcs: Checkout project `foobar' version foo.1.
prcs: Project file `foobar.prj' already exists.  Replacing.
prcs: Checkout project `foobar' version foo.2.
version : ( -r foo.2 foobar)
prcs: Checking in project `foobar' version foo.2.

# --------
#
# 9. checkout bar from local repo
#

<prcsuser@multicad> ~ $ prcs checkout -r bar foobar
prcs: Checkout project `foobar' version bar.2.
Project file `foobar.prj' already exists.  Replace(nyq?)[y] 
File `foobar' differs.  Replace(nyq!?)[y] 
<prcsuser@multicad> ~ $ cat foobar
line 1
line 2
line 3
line 4
line 5
line 6
line 7
line 8

# --------
#
# 10. merge with branch foo
#

<prcsuser@multicad> ~ $ prcs merge -r foo
prcs: Working version:  bar.2(w)
prcs: Common version:   bar.1
prcs: Selected version: foo.2
prcs: *** Action on file `foobar'
prcs: Choose an action on file `foobar' for rule 2: All three files exist and are different in each version.
Please select(dnmrhvq!?)[m] 
prcs: Merge file `foobar' by rule 2
prcs: Merge against version foo.2 complete.

# --------
#
# 11. check contents, checkin (on branch bar)
#

<prcsuser@multicad> ~ $ cat foobar
line 1
line 5
line 6
line 7
line 8
<prcsuser@multicad> ~ $ prcs checkin
prcs: Checking in project `foobar' version bar.3.

# --------
#
# 12. use xemacs to copy/paste this xterm window's contents and decorate it 
#	with some comments
#

<prcsuser@multicad> ~ $ xemacs rprcs_session.log
<prcsuser@multicad> ~ $