You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@qpid.apache.org by "Bruno Matos (JIRA)" <qp...@incubator.apache.org> on 2010/01/22 22:50:21 UTC
[jira] Created: (QPID-2358) SVN conflict
SVN conflict
------------
Key: QPID-2358
URL: https://issues.apache.org/jira/browse/QPID-2358
Project: Qpid
Issue Type: Bug
Components: Documentation
Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
Reporter: Bruno Matos
Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
Could you please see that?
Thank you!
Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Assigned: (QPID-2358) SVN conflict
Posted by "Steve Huston (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Steve Huston reassigned QPID-2358:
----------------------------------
Assignee: Jonathan Robie
Jonathan, I looked at this a minute and it appears there are 3 files similarly named and this issue occurs a couple of other times in the directory too. I assume you're on top of this, but please update this as things are resolved - other people will also trip over this issue.
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Assignee: Jonathan Robie
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Commented: (QPID-2358) SVN conflict
Posted by "Bruno Matos (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12804146#action_12804146 ]
Bruno Matos commented on QPID-2358:
-----------------------------------
I think problem is in commit 901917.
Regards.
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Assignee: Jonathan Robie
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Issue Comment Edited: (QPID-2358) SVN conflict
Posted by "Jonathan Robie (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12804295#action_12804295 ]
Jonathan Robie edited comment on QPID-2358 at 1/24/10 8:30 PM:
---------------------------------------------------------------
First off, thanks for pointing this out - ouch! I apologize to everyone affected by this.
I deleted some files that may have been causing this difficulty. I do not experience the same issue on my box, so it's hard for me to be sure that I've fixed it - can you let me know if you still have the problem?
was (Author: jonathan.robie):
First off, thanks for pointing this out - ouch!
I deleted some files that may have been causing this difficulty. I do not experience the same issue on my box, so it's hard for me to be sure that I've fixed it - can you let me know if you still have the problem?
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Assignee: Jonathan Robie
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Commented: (QPID-2358) SVN conflict
Posted by "Bruno Matos (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12804300#action_12804300 ]
Bruno Matos commented on QPID-2358:
-----------------------------------
It's ok now!
Thanks a lot!
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Assignee: Jonathan Robie
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Commented: (QPID-2358) SVN conflict
Posted by "Bruno Matos (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12804133#action_12804133 ]
Bruno Matos commented on QPID-2358:
-----------------------------------
I tried another client, but the problem remains:
In directory '/Users/bmm/Documents/qpid/doc/book/src'
Can't copy '/Users/bmm/Documents/qpid/doc/book/src/.svn/tmp/text-base/AMQP compatibility.xml.svn-base' to '/Users/bmm/Documents/qpid/doc/book/src/.svn/tmp/AMQP compatibility.xml.tmp.tmp': Undefined error: 0
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Closed: (QPID-2358) SVN conflict
Posted by "Bruno Matos (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Bruno Matos closed QPID-2358.
-----------------------------
Resolution: Fixed
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Assignee: Jonathan Robie
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org
[jira] Commented: (QPID-2358) SVN conflict
Posted by "Jonathan Robie (JIRA)" <qp...@incubator.apache.org>.
[ https://issues.apache.org/jira/browse/QPID-2358?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12804295#action_12804295 ]
Jonathan Robie commented on QPID-2358:
--------------------------------------
First off, thanks for pointing this out - ouch!
I deleted some files that may have been causing this difficulty. I do not experience the same issue on my box, so it's hard for me to be sure that I've fixed it - can you let me know if you still have the problem?
> SVN conflict
> ------------
>
> Key: QPID-2358
> URL: https://issues.apache.org/jira/browse/QPID-2358
> Project: Qpid
> Issue Type: Bug
> Components: Documentation
> Environment: PowerBook G4 - Mac OS X Leopard svn, version 1.4.4 (r25188) compiled Sep 28 2009, 16:25:45
> Reporter: Bruno Matos
> Assignee: Jonathan Robie
> Original Estimate: 0.08h
> Remaining Estimate: 0.08h
>
> Subversion checkout has a conflict with the files: http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP Compatibility.xml and http://svn.apache.org/repos/asf/qpid/trunk/qpid/doc/book/src/AMQP compatibility.xml.
> Could you please see that?
> Thank you!
> Regards.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org