On Fri, Jun 27, 2008 at 9:46 AM, Joe <qbproger_at_gmail.com> wrote:
> The first problem:
>
> I just did a VERY larger merge through tortoise (I'm not a fan of
> merging in subclipse).
You should try the CollabNet merge client which is built atop
Subclipse. I will be adding info on this to the Subclipse web site in
the coming weeks. Here is some info:
http://www.collab.net/community/integrations/articles/merge.html
> Anyway, I loaded up the changes in eclipse,
> did a refresh to get all the files loaded. Then I did a clean and
> rebuild. This got all the build errors gone. Now I'm trying to
> commit (through subclipse) and I'm getting an error message.
>
> Here is the message I'm getting:
>
> Item is out of date
> svn: Commit failed (details follow):
> svn: Item '(full path removed)' is out of date
>
> unless I hear back VERY quickly on this issue, I'm going to do it
> using tortoise.
I am sure it is too late, but I am 100% sure when you reverted back to
TortoiseSVN, you found that you have the same problem. Perhaps the
SVN error message is too daft, but it is basically saying that
something you are committing was not at the HEAD revision in your
working copy. You need to update and then commit.
> The second problem:
>
> When I do an update on the project folder I get the following error:
>
> An internal error occurred during: "SVN Update".
> Attempted to beginRule: P/(removed), does not match outer scope rule:
> P/(removed)
>
> If the actual part after the P/ is useful I'd rather send it to an
> individual person than the whole mailing list. If I do an update on
> the src folder inside the project it works fine.
You are not the only person to report this. We have not been able to
recreate it to fix it. If you have any ideas on the secret recipe to
reproduce let us know. When we see this kind of error, there is one
semi-obvious fix we can make. When we looked at code, that fix was
already in it. So we are at a loss as to what to do at the moment.
> On another note, it seems the new commit dialog adds unversioned files
> by default (I may be wrong about this). That seems like an odd
> behavior. What was the reason for moving away from a list with
> checkboxes? I'm updating from 1.2.x or 1.3.x, I'm not 100% sure.
The logic behind it is that for most people, most of the time, they
want to commit/revert everything in the dialog. The check boxes
confuse the UI for the normal case. You can right-click to remove
items. The UI for this dialog was modeled after the CVS dialogs in
Eclipse, which have been like this for many years now. I looked for
bug reports where people complained but could not find any. So we
went with it. I blogged about this a year ago when we added it.
http://markphip.blogspot.com/2007/09/new-subclipse-build-posted-dialog.html
We are going to make an enhancement for 1.4.1 where there is a single
checkbox in the dialog to show/hide unversioned items. It remembers
your last setting. The checkbox only appears when there are
unversioned items, which hopefully makes it more obvious.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-06-30 00:25:15 CEST