php
Updated to revision 4.
A Notice the status check on our working copy before proceeding
B The update command which initiates the update action
As indicated by the A preceding each output line we can see in listing 10.7 that the file ViewRenderer.php
has been added together with its parent directories. This has been a simple update with no changes conflicting
with our working copy however when conflicts do occur we need to be able to deal with them.Dealing
with conflicts
Subversion is able to manage changes even when two people have edited the same file at the same time,
by simply combining changes as needed. In some cases however, conflicts may arise, if, for example, changes
have been made to the same lines of a file. In this instance a later update results in a conflict with the file
bootstrap.php as indicated by the C preceding the file information:
$ svn update
C application/bootstrap.php
Updated to revision 5.
In figure 10.2 we can see that the update produced four variations of the conflicting file;
bootstrap.php.r1100 is the original before our local modification, bootstrap.php.r1102 is the version that Rob
commited to the repository, bootstrap.php.mine is the modified version in our local working copy and finally,
bootstrap.php contains the diff of both versions.
Pages:
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290