1 | svn, version 1.6.5 (r38866)
|
---|
2 | compiled Oct 16 2009, 02:54:10
|
---|
3 |
|
---|
4 | Copyright (C) 2000-2009 CollabNet.
|
---|
5 | Subversion is open source software, see http://subversion.tigris.org/
|
---|
6 | This product includes software developed by CollabNet (http://www.Collab.Net/).
|
---|
7 |
|
---|
8 | The following repository access (RA) modules are available:
|
---|
9 |
|
---|
10 | * ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
|
---|
11 | - handles 'http' scheme
|
---|
12 | - handles 'https' scheme
|
---|
13 | * ra_svn : Module for accessing a repository using the svn network protocol.
|
---|
14 | - handles 'svn' scheme
|
---|
15 | * ra_local : Module for accessing a repository on local disk.
|
---|
16 | - handles 'file' scheme
|
---|
17 |
|
---|
18 | Sending toms/build.xml
|
---|
19 | Transmitting file data .
|
---|
20 | Committed revision 22566.
|
---|
21 | At revision 22566.
|
---|
22 | C ../../dist/toms.jar
|
---|
23 | At revision 22566.
|
---|
24 | Summary of conflicts:
|
---|
25 | Tree conflicts: 1
|
---|
26 | svn: Commit failed (details follow):
|
---|
27 | svn: Aborting commit: '/Users/mherring/josm/dist/toms.jar' remains in conflict
|
---|
28 | svn, version 1.6.5 (r38866)
|
---|
29 | compiled Oct 16 2009, 02:54:10
|
---|
30 |
|
---|
31 | Copyright (C) 2000-2009 CollabNet.
|
---|
32 | Subversion is open source software, see http://subversion.tigris.org/
|
---|
33 | This product includes software developed by CollabNet (http://www.Collab.Net/).
|
---|
34 |
|
---|
35 | The following repository access (RA) modules are available:
|
---|
36 |
|
---|
37 | * ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
|
---|
38 | - handles 'http' scheme
|
---|
39 | - handles 'https' scheme
|
---|
40 | * ra_svn : Module for accessing a repository using the svn network protocol.
|
---|
41 | - handles 'svn' scheme
|
---|
42 | * ra_local : Module for accessing a repository on local disk.
|
---|
43 | - handles 'file' scheme
|
---|
44 |
|
---|
45 | At revision 22571.
|
---|
46 | Skipped '../../dist/toms.jar'
|
---|
47 | At revision 22571.
|
---|
48 | Summary of conflicts:
|
---|
49 | Skipped paths: 1
|
---|
50 | svn: Commit failed (details follow):
|
---|
51 | svn: Aborting commit: '/Users/mherring/josm/dist/toms.jar' remains in conflict
|
---|
52 | svn, version 1.6.5 (r38866)
|
---|
53 | compiled Oct 16 2009, 02:54:10
|
---|
54 |
|
---|
55 | Copyright (C) 2000-2009 CollabNet.
|
---|
56 | Subversion is open source software, see http://subversion.tigris.org/
|
---|
57 | This product includes software developed by CollabNet (http://www.Collab.Net/).
|
---|
58 |
|
---|
59 | The following repository access (RA) modules are available:
|
---|
60 |
|
---|
61 | * ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
|
---|
62 | - handles 'http' scheme
|
---|
63 | - handles 'https' scheme
|
---|
64 | * ra_svn : Module for accessing a repository using the svn network protocol.
|
---|
65 | - handles 'svn' scheme
|
---|
66 | * ra_local : Module for accessing a repository on local disk.
|
---|
67 | - handles 'file' scheme
|
---|
68 |
|
---|
69 | Sending toms/src/toms/dialogs/SmpDialogAction.java
|
---|
70 | Transmitting file data .
|
---|
71 | Committed revision 22572.
|
---|
72 | At revision 22572.
|
---|
73 | Skipped '../../dist/toms.jar'
|
---|
74 | At revision 22572.
|
---|
75 | Summary of conflicts:
|
---|
76 | Skipped paths: 1
|
---|
77 | svn: Commit failed (details follow):
|
---|
78 | svn: Aborting commit: '/Users/mherring/josm/dist/toms.jar' remains in conflict
|
---|