I took out most of my original post so this didn't get extremely long.
On Sun, Jun 29, 2008 at 6:24 PM, Mark Phippard <markphip_at_gmail.com> wrote:
> 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:
I tried the merge in the new Tortoise client, and I'm already
impressed with that. I doubt I'll switch, but may give it a shot when
it gets added to the subclipse site.
> 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.
I did continue to get those errors in TortoiseSVN. I did an update
and that didn't fix the problem. I ended up just ditching the branch
I was working with. I created a new branch of the trunk, and merged
my changes into that. It was a MUCH smaller merge this way (someone
just did a huge merge into the trunk). This has already been mostly
done, so it's no longer an issue.
>> 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:
>> 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.
The repository does have external references. I'm at home right now,
when I'm at work tomorrow I'll look into project dependencies, and see
if there is a dependency issue. The project is based on the Eclipse
RCP Platform, I don't know if that has anything to do with it.
Anyway, I'll give more info tomorrow.
> 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.
> 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.
1.4.1 will probably be better for me then. I have several unversioned
files, and removing them ALL every commit will get annoying. I want
to see them though because I usually look through them to see if I
forgot anything that is supposed to be committed. I'm not definitely
going to do this, but I may use TortoiseSVN for commits. I'm very used
to the checkboxes dialog. I like being able to right-click and add an
unversioned file in the dialog, and everything that is unversioned
isn't committed by default. An option to choose between the two
dialog styles would be great, but I understand this probably isn't
> Mark Phippard
> To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
> For additional commands, e-mail: users-help_at_subclipse.tigris.org
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:49:24 CEST