Login | Register
My pages Projects Community openCollabNet

Discussions > users > [Subclipse-users] Merge info not commited?

subclipse
Discussion topic

Hide all messages in topic

All messages in topic

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2014-12-09 11:07:04 PST
Message One more thing:

"Commit All Outgoing Changes..." does not help either. It also doesn't show the merged mark.

After Refresh (F5) both diaogs show the correct merge icons.


David Balažic
Software Engineer
www.comtrade.com

From: David Balažic [mailto:david.balazi​c@comtrade.com]
Sent: 9. December 2014 19:59
To: users at subclipse dot tigris dot org
Subject: RE: [Subclipse-users] Merge info not commited?
Importance: Low

I still see this.
Version 1.10.6

I use Sync view , right click on multiple merged projects and select Commit… in the menu.

Regards,
David Balažic
Software Engineer
www.comtrade.com<http://www.comtrade.com>

From: Stephen Elsemore [mailto:selsemore at collab dot net]
Sent: 11. June 2014 23:15
To: users at subclipse dot tigr​is.org<mailto:use​rs at subclipse dot tigris.​org>
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

I am not seeing this problem. I changed one file in each of three projects and then merged the three projects into another branch. The sync view shows the three files as having outgoing changes and also shows the three project folders as having outgoing changes (the merge info properties). When I click on the "Commit All Outgoing Changes..." icon, the commit dialog includes the property changes as well as the file changes. Please let me know if this recipe doesn't match what you're doing/seeing.

Thanks,
Steve

On Wed, Jun 11, 2014 at 5:36 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
I bumped into this issue again.
I merged on 3 projects.
The Sync view Commit does not show the merge info changes.
The Team/Commit... does.

But the Team/Commit.. does not respect the "Remove from view" setting.

Is this a bug in the Sync view code?

Currently I use:
Eclipse Java EE IDE for Web Developers.

Version: Kepler Service Release 2
Build id: 20140224-0627
Subclipse (Required) 1.10.5 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>
Subversion Client Adapter (Required) 1.10.1 org.tigris.subversio​n.clientadapter.feat​ure.feature.group tigris.org<http://tigris.org>
Subversion JavaHL Native Library Adapter 1.8.9 org.tigris.subversio​n.clientadapter.java​hl.feature.feature.g​roup tigris.org<http://tigris.org>

Regards,
David Balažic
Software Engineer
Attachments

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2014-12-09 10:58:52 PST
Message I still see this.
Version 1.10.6

I use Sync view , right click on multiple merged projects and select Commit… in the menu.

Regards,
David Balažic
Software Engineer
www.comtrade.com

From: Stephen Elsemore [mailto:selsemore at collab dot net]
Sent: 11. June 2014 23:15
To: users at subclipse dot tigris dot org
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

I am not seeing this problem. I changed one file in each of three projects and then merged the three projects into another branch. The sync view shows the three files as having outgoing changes and also shows the three project folders as having outgoing changes (the merge info properties). When I click on the "Commit All Outgoing Changes..." icon, the commit dialog includes the property changes as well as the file changes. Please let me know if this recipe doesn't match what you're doing/seeing.

Thanks,
Steve

On Wed, Jun 11, 2014 at 5:36 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
I bumped into this issue again.
I merged on 3 projects.
The Sync view Commit does not show the merge info changes.
The Team/Commit... does.

But the Team/Commit.. does not respect the "Remove from view" setting.

Is this a bug in the Sync view code?

Currently I use:
Eclipse Java EE IDE for Web Developers.

Version: Kepler Service Release 2
Build id: 20140224-0627
Subclipse (Required) 1.10.5 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>
Subversion Client Adapter (Required) 1.10.1 org.tigris.subversio​n.clientadapter.feat​ure.feature.group tigris.org<http://tigris.org>
Subversion JavaHL Native Library Adapter 1.8.9 org.tigris.subversio​n.clientadapter.java​hl.feature.feature.g​roup tigris.org<http://tigris.org>

Regards,
David Balažic
Software Engineer
Attachments

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2014-06-12 02:45:55 PDT
Message I'll try that.

What I did was select a few projects, right click and select the Commit... menu item.


David Balažic
Software Engineer
www.comtrade.com

From: Stephen Elsemore [mailto:selsemore at collab dot net]
Sent: 11. June 2014 23:15
To: users at subclipse dot tigris dot org
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

I am not seeing this problem. I changed one file in each of three projects and then merged the three projects into another branch. The sync view shows the three files as having outgoing changes and also shows the three project folders as having outgoing changes (the merge info properties). When I click on the "Commit All Outgoing Changes..." icon, the commit dialog includes the property changes as well as the file changes. Please let me know if this recipe doesn't match what you're doing/seeing.

Thanks,
Steve

On Wed, Jun 11, 2014 at 5:36 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
I bumped into this issue again.
I merged on 3 projects.
The Sync view Commit does not show the merge info changes.
The Team/Commit... does.

But the Team/Commit.. does not respect the "Remove from view" setting.

Is this a bug in the Sync view code?

Currently I use:
Eclipse Java EE IDE for Web Developers.

Version: Kepler Service Release 2
Build id: 20140224-0627
Subclipse (Required) 1.10.5 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>
Subversion Client Adapter (Required) 1.10.1 org.tigris.subversio​n.clientadapter.feat​ure.feature.group tigris.org<http://tigris.org>
Subversion JavaHL Native Library Adapter 1.8.9 org.tigris.subversio​n.clientadapter.java​hl.feature.feature.g​roup tigris.org<http://tigris.org>

Regards,
David Balažic
Software Engineer
Attachments

Re: [Subclipse-users] Merge info not commited?

Author selsemore
Full name Stephen Elsemore
Date 2014-06-11 14:14:50 PDT
Message I am not seeing this problem. I changed one file in each of three projects
and then merged the three projects into another branch. The sync view
shows the three files as having outgoing changes and also shows the three
project folders as having outgoing changes (the merge info properties).
When I click on the "Commit All Outgoing Changes..." icon, the commit
dialog includes the property changes as well as the file changes. Please
let me know if this recipe doesn't match what you're doing/seeing.

Thanks,
Steve

On Wed, Jun 11, 2014 at 5:36 AM, David Balažic <david.balazic@co​mtrade.com>
wrote:

> I bumped into this issue again.
>
> I merged on 3 projects.
>
> The Sync view Commit does not show the merge info changes.
>
> The Team/Commit... does.
>
>
>
> But the Team/Commit.. does not respect the "Remove from view" setting.
>
>
>
> Is this a bug in the Sync view code?
>
>
>
> Currently I use:
> Eclipse Java EE IDE for Web Developers.
>
>
>
> Version: Kepler Service Release 2
>
> Build id: 20140224-0627
>
> Subclipse (Required) 1.10.5
> org.tigris.subversio​n.subclipse.feature.​group tigris.org
>
> Subversion Client Adapter (Required) 1.10.1
> org.tigris.subversio​n.clientadapter.feat​ure.feature.group
> tigris.org
>
> Subversion JavaHL Native Library Adapter 1.8.9
> org.tigris.subversio​n.clientadapter.java​hl.feature.feature.g​roup
> tigris.org
>
>
>
> Regards,
>
> David Balažic
>
> Software Engineer
>
Attachments

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2014-06-11 05:36:33 PDT
Message I bumped into this issue again.
I merged on 3 projects.
The Sync view Commit does not show the merge info changes.
The Team/Commit... does.

But the Team/Commit.. does not respect the "Remove from view" setting.

Is this a bug in the Sync view code?

Currently I use:
Eclipse Java EE IDE for Web Developers.

Version: Kepler Service Release 2
Build id: 20140224-0627
Subclipse (Required) 1.10.5 org.tigris.subversio​n.subclipse.feature.​group tigris.org
Subversion Client Adapter (Required) 1.10.1 org.tigris.subversio​n.clientadapter.feat​ure.feature.group tigris.org
Subversion JavaHL Native Library Adapter 1.8.9 org.tigris.subversio​n.clientadapter.java​hl.feature.feature.g​roup tigris.org

Regards,
David Balažic
Software Engineer
www.comtrade.com

From: David Balažic
Sent: 11. March 2013 16:27
To: 'users'
Subject: RE: [Subclipse-users] Merge info not commited?

Team > Clean/Refresh does not make it different.

Team > Commit from the Package Explorer on the other hand shows the property change in the Commit dialog.


David Balažic
Software Engineer
www.comtrade.com<http://www.comtrade.com>


____________________​____________
From: Mark Phippard [mailto:markphip at gmail dot com]
Sent: Monday, March 11, 2013 4:02 PM
To: users at subclipse dot tigr​is.org<mailto:use​rs at subclipse dot tigris.​org>
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low
I do not use Sync view so suppose it is possible. Try doing the Team > Clean/Refresh option after the merge and see if that makes a difference. It is possible there is an issue with how SVN sends the notifications for mergeinfo changes as opposed to other property changes that occur during a merge and so the Sync view does not know the resource has changes.

I would also guess that doing Team > Commit from the Package Explorer would not have an issue.

Mark

On Mon, Mar 11, 2013 at 10:53 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
I just merged a change that changes two files in the project (different subfolder).
In the Synchronize view the project is shown, with two subfolder and one file in each.
I right clicket he top item (the project) and selected Commit...
The Commit dialog shows these items under Changes:
 - project_x/folder1/folder11
 -- file1
 - project_x/folder2/folder22
 -- file2

The green triangle item for the project is missing.

TSVN confirms that the project folder has changed properties.

I commit (in subclipse).

I recheck with TSVN and it still shows the proprties changed and uncommited.

Then in subclipse I do Sync with repository.
Now the project folder is marked as conflicted (red double arrow).
I do an Update on it.

Now finally it shows the green triangle* in the commit dialog. (but not on the Synchronize view, there the icon has just the gray right arrow).
I still don't see a way to show the changes (of the property).

* it is actually a white triangle inside a green square


PS: TSVN is of course TortoiseSVN

David Balažic
Software Engineer
www.comtrade.com<http://www.comtrade.com>


____________________​____________
From: Mark Phippard [mailto:markphip@gma​il.com<mailto:mar​kphip at gmail dot com>]​
Sent: Monday, March 11, 2013 3:24 PM
To: users at subclipse dot tigr​is.org<mailto:use​rs at subclipse dot tigris.​org>
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low
Mergeinfo is just a property and we show those and text changes in the UI. Subversion itself is responsible for reporting this information and doing the actual commit.

Keep in mind that everything is going to be scoped to your selection. So if you do not select the project when you take a commit option it is not going to be included in the dialog or the commit itself. For example, if you just selected the package or files that had changes, the mergeinfo recorded on the project would not go with it. TortoiseSVN and the SVN command line would behave the same if you drilled down to one of those folders and did the commit.


On Mon, Mar 11, 2013 at 10:20 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
Hi!

When I do a merge and commit the result, sometimes the merge info (svn:mergeinfo property on the root folder) is not commited.
In the commit dialog there should be an entry for this folder with a small greem triangle on it.
But sometimes this is missing.
If I check the files (of the working copy) with another client (TSVN 1.7.11), I see that the top folder has the uncommited change (the mentioned svn:mergeinfo property).
Also if I commit what the dialog offers, the property change stays uncommited.

Looks like a bug?

On a related note, when there is such an uncommited change (of file properties, usually on a folder), subclipse shows the folder as modified, but doubleclicking on it shows nothing.
It seems weird, as the GUI lists the object in the list of changed files, but does not say what is changed. It looks like a bug.


Version info:

Windows 7 Pro SP1 64 bit

Eclipse Java EE IDE for Web Developers.

Version: Indigo Service Release 2
Build id: 20120216-1857


  Subclipse (Required) 1.8.18 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>

Regards,
David
David Balažic
Software Engineer

    ComTrade

    Letališka cesta 29b, 1000 Ljubljana
    Slovenia

    phone: +386 81 60 8937<tel:%2B386%2​081%2060%208937>
    fax: +386 1 586 52 70<tel:%2B386%201​%20586%2052%2070>​

www.comtrade.com<http://www.comtrade.com>

--------------------​--------------------​--------------
http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=305​0771

To unsubscribe from this discussion, e-mail: [users-unsubscribe@s​ubclipse.tigris.org​<mailto:users-unsu​bscribe at subclipse dot ti​gris.org>].



--
Thanks

Mark Phippard
http://markphip.blogspot.com/



--
Thanks

Mark Phippard
http://markphip.blogspot.com/
Attachments

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2013-03-11 08:37:42 PDT
Message Additional note: I use the "Remove from view" option for a subfolder and two files , all in the root of the project.
The merged changes are not in that subfolder (it is the .settings folder from Eclipse - somebody commited it and now it keeps getting in the way...).


David Balažic
Software Engineer
www.comtrade.com



____________________​____________
From: Mark Phippard [mailto:markphip at gmail dot com]
Sent: Monday, March 11, 2013 4:02 PM
To: users at subclipse dot tigris dot org
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

I do not use Sync view so suppose it is possible. Try doing the Team > Clean/Refresh option after the merge and see if that makes a difference. It is possible there is an issue with how SVN sends the notifications for mergeinfo changes as opposed to other property changes that occur during a merge and so the Sync view does not know the resource has changes.

I would also guess that doing Team > Commit from the Package Explorer would not have an issue.

Mark


On Mon, Mar 11, 2013 at 10:53 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
I just merged a change that changes two files in the project (different subfolder).
In the Synchronize view the project is shown, with two subfolder and one file in each.
I right clicket he top item (the project) and selected Commit...
The Commit dialog shows these items under Changes:
 - project_x/folder1/folder11
 -- file1
 - project_x/folder2/folder22
 -- file2

The green triangle item for the project is missing.

TSVN confirms that the project folder has changed properties.

I commit (in subclipse).

I recheck with TSVN and it still shows the proprties changed and uncommited.

Then in subclipse I do Sync with repository.
Now the project folder is marked as conflicted (red double arrow).
I do an Update on it.

Now finally it shows the green triangle* in the commit dialog. (but not on the Synchronize view, there the icon has just the gray right arrow).
I still don't see a way to show the changes (of the property).

* it is actually a white triangle inside a green square


PS: TSVN is of course TortoiseSVN

David Balažic
Software Engineer
www.comtrade.com<http://www.comtrade.com>



____________________​____________
From: Mark Phippard [mailto:markphip@gma​il.com<mailto:mar​kphip at gmail dot com>]​
Sent: Monday, March 11, 2013 3:24 PM
To: users at subclipse dot tigr​is.org<mailto:use​rs at subclipse dot tigris.​org>
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

Mergeinfo is just a property and we show those and text changes in the UI. Subversion itself is responsible for reporting this information and doing the actual commit.

Keep in mind that everything is going to be scoped to your selection. So if you do not select the project when you take a commit option it is not going to be included in the dialog or the commit itself. For example, if you just selected the package or files that had changes, the mergeinfo recorded on the project would not go with it. TortoiseSVN and the SVN command line would behave the same if you drilled down to one of those folders and did the commit.



On Mon, Mar 11, 2013 at 10:20 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
Hi!

When I do a merge and commit the result, sometimes the merge info (svn:mergeinfo property on the root folder) is not commited.
In the commit dialog there should be an entry for this folder with a small greem triangle on it.
But sometimes this is missing.
If I check the files (of the working copy) with another client (TSVN 1.7.11), I see that the top folder has the uncommited change (the mentioned svn:mergeinfo property).
Also if I commit what the dialog offers, the property change stays uncommited.

Looks like a bug?

On a related note, when there is such an uncommited change (of file properties, usually on a folder), subclipse shows the folder as modified, but doubleclicking on it shows nothing.
It seems weird, as the GUI lists the object in the list of changed files, but does not say what is changed. It looks like a bug.


Version info:

Windows 7 Pro SP1 64 bit

Eclipse Java EE IDE for Web Developers.

Version: Indigo Service Release 2
Build id: 20120216-1857


  Subclipse (Required) 1.8.18 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>

Regards,
David
David Balažic
Software Engineer

    ComTrade

    Letališka cesta 29b, 1000 Ljubljana
    Slovenia

    phone: +386 81 60 8937<tel:%2B386%2​081%2060%208937>
    fax: +386 1 586 52 70<tel:%2B386%201​%20586%2052%2070>​

www.comtrade.com<http://www.comtrade.com>

--------------------​--------------------​--------------
http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=305​0771

To unsubscribe from this discussion, e-mail: [users-unsubscribe@s​ubclipse.tigris.org​<mailto:users-unsu​bscribe at subclipse dot ti​gris.org>].



--
Thanks

Mark Phippard
http://markphip.blogspot.com/



--
Thanks

Mark Phippard
http://markphip.blogspot.com/
Attachments

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2013-03-11 08:27:08 PDT
Message Team > Clean/Refresh does not make it different.

Team > Commit from the Package Explorer on the other hand shows the property change in the Commit dialog.


David Balažic
Software Engineer
www.comtrade.com



____________________​____________
From: Mark Phippard [mailto:markphip at gmail dot com]
Sent: Monday, March 11, 2013 4:02 PM
To: users at subclipse dot tigris dot org
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

I do not use Sync view so suppose it is possible. Try doing the Team > Clean/Refresh option after the merge and see if that makes a difference. It is possible there is an issue with how SVN sends the notifications for mergeinfo changes as opposed to other property changes that occur during a merge and so the Sync view does not know the resource has changes.

I would also guess that doing Team > Commit from the Package Explorer would not have an issue.

Mark


On Mon, Mar 11, 2013 at 10:53 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
I just merged a change that changes two files in the project (different subfolder).
In the Synchronize view the project is shown, with two subfolder and one file in each.
I right clicket he top item (the project) and selected Commit...
The Commit dialog shows these items under Changes:
 - project_x/folder1/folder11
 -- file1
 - project_x/folder2/folder22
 -- file2

The green triangle item for the project is missing.

TSVN confirms that the project folder has changed properties.

I commit (in subclipse).

I recheck with TSVN and it still shows the proprties changed and uncommited.

Then in subclipse I do Sync with repository.
Now the project folder is marked as conflicted (red double arrow).
I do an Update on it.

Now finally it shows the green triangle* in the commit dialog. (but not on the Synchronize view, there the icon has just the gray right arrow).
I still don't see a way to show the changes (of the property).

* it is actually a white triangle inside a green square


PS: TSVN is of course TortoiseSVN

David Balažic
Software Engineer
www.comtrade.com<http://www.comtrade.com>



____________________​____________
From: Mark Phippard [mailto:markphip@gma​il.com<mailto:mar​kphip at gmail dot com>]​
Sent: Monday, March 11, 2013 3:24 PM
To: users at subclipse dot tigr​is.org<mailto:use​rs at subclipse dot tigris.​org>
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

Mergeinfo is just a property and we show those and text changes in the UI. Subversion itself is responsible for reporting this information and doing the actual commit.

Keep in mind that everything is going to be scoped to your selection. So if you do not select the project when you take a commit option it is not going to be included in the dialog or the commit itself. For example, if you just selected the package or files that had changes, the mergeinfo recorded on the project would not go with it. TortoiseSVN and the SVN command line would behave the same if you drilled down to one of those folders and did the commit.



On Mon, Mar 11, 2013 at 10:20 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
Hi!

When I do a merge and commit the result, sometimes the merge info (svn:mergeinfo property on the root folder) is not commited.
In the commit dialog there should be an entry for this folder with a small greem triangle on it.
But sometimes this is missing.
If I check the files (of the working copy) with another client (TSVN 1.7.11), I see that the top folder has the uncommited change (the mentioned svn:mergeinfo property).
Also if I commit what the dialog offers, the property change stays uncommited.

Looks like a bug?

On a related note, when there is such an uncommited change (of file properties, usually on a folder), subclipse shows the folder as modified, but doubleclicking on it shows nothing.
It seems weird, as the GUI lists the object in the list of changed files, but does not say what is changed. It looks like a bug.


Version info:

Windows 7 Pro SP1 64 bit

Eclipse Java EE IDE for Web Developers.

Version: Indigo Service Release 2
Build id: 20120216-1857


  Subclipse (Required) 1.8.18 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>

Regards,
David
David Balažic
Software Engineer

    ComTrade

    Letališka cesta 29b, 1000 Ljubljana
    Slovenia

    phone: +386 81 60 8937<tel:%2B386%2​081%2060%208937>
    fax: +386 1 586 52 70<tel:%2B386%201​%20586%2052%2070>​

www.comtrade.com<http://www.comtrade.com>

--------------------​--------------------​--------------
http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=305​0771

To unsubscribe from this discussion, e-mail: [users-unsubscribe@s​ubclipse.tigris.org​<mailto:users-unsu​bscribe at subclipse dot ti​gris.org>].



--
Thanks

Mark Phippard
http://markphip.blogspot.com/



--
Thanks

Mark Phippard
http://markphip.blogspot.com/
Attachments

Re: [Subclipse-users] Merge info not commited?

Author markphip
Full name Mark Phippard
Date 2013-03-11 08:02:15 PDT
Message I do not use Sync view so suppose it is possible. Try doing the Team >
Clean/Refresh option after the merge and see if that makes a difference.
 It is possible there is an issue with how SVN sends the notifications for
mergeinfo changes as opposed to other property changes that occur during a
merge and so the Sync view does not know the resource has changes.

I would also guess that doing Team > Commit from the Package Explorer would
not have an issue.

Mark


On Mon, Mar 11, 2013 at 10:53 AM, David Balažic
<david.balazic@co​mtrade.com>wrote:​

> **
> I just merged a change that changes two files in the project (different
> subfolder).
> In the Synchronize view the project is shown, with two subfolder and one
> file in each.
> I right clicket he top item (the project) and selected Commit...
> The Commit dialog shows these items under Changes:
> - project_x/folder1/folder11
> -- file1
> - project_x/folder2/folder22
> -- file2
>
> The green triangle item for the project is missing.
>
> TSVN confirms that the project folder has changed properties.
>
> I commit (in subclipse).
>
> I recheck with TSVN and it still shows the proprties changed and
> uncommited.
>
> Then in subclipse I do Sync with repository.
> Now the project folder is marked as conflicted (red double arrow).
> I do an Update on it.
>
> Now finally it shows the green triangle* in the commit dialog. (but not on
> the Synchronize view, there the icon has just the gray right arrow).
> I still don't see a way to show the changes (of the property).
>
> * it is actually a white triangle inside a green square
>
>
> PS: TSVN is of course TortoiseSVN
>
> David Balažic
> Software Engineer
> www.comtrade.com
>
>
> ------------------------------
> *From:* Mark Phippard [mailto:markphip at gmail dot com]
> *Sent:* Monday, March 11, 2013 3:24 PM
> *To:* users at subclipse dot tigris dot org
> *Subject:* Re: [Subclipse-users] Merge info not commited?
> *Importance:* Low
>
> Mergeinfo is just a property and we show those and text changes in the
> UI. Subversion itself is responsible for reporting this information and
> doing the actual commit.
>
> Keep in mind that everything is going to be scoped to your selection.
> So if you do not select the project when you take a commit option it is
> not going to be included in the dialog or the commit itself. For example,
> if you just selected the package or files that had changes, the mergeinfo
> recorded on the project would not go with it. TortoiseSVN and the SVN
> command line would behave the same if you drilled down to one of those
> folders and did the commit.
>
>
>
> On Mon, Mar 11, 2013 at 10:20 AM, David Balažic <
> david dot balazic at comtrade dot com> wrote:
>
>> Hi!
>>
>> When I do a merge and commit the result, sometimes the merge info
>> (svn:mergeinfo property on the root folder) is not commited.
>> In the commit dialog there should be an entry for this folder with a
>> small greem triangle on it.
>> But sometimes this is missing.
>> If I check the files (of the working copy) with another client (TSVN
>> 1.7.11), I see that the top folder has the uncommited change (the mentioned
>> svn:mergeinfo property).
>> Also if I commit what the dialog offers, the property change stays
>> uncommited.
>>
>> Looks like a bug?
>>
>> On a related note, when there is such an uncommited change (of file
>> properties, usually on a folder), subclipse shows the folder as modified,
>> but doubleclicking on it shows nothing.
>> It seems weird, as the GUI lists the object in the list of changed files,
>> but does not say what is changed. It looks like a bug.
>>
>>
>> Version info:
>>
>> Windows 7 Pro SP1 64 bit
>>
>> Eclipse Java EE IDE for Web Developers.
>>
>> Version: Indigo Service Release 2
>> Build id: 20120216-1857
>>
>>
>> Subclipse (Required) 1.8.18
>> org.tigris.subversio​n.subclipse.feature.​group tigris.org
>>
>> Regards,
>> David
>> David Balažic
>> Software Engineer
>>
>> ComTrade
>>
>> Letališka cesta 29b, 1000 Ljubljana
>> Slovenia
>>
>> phone: +386 81 60 8937
>> fax: +386 1 586 52 70
>>
>> www.comtrade.com
>>
>> --------------------​--------------------​--------------
>>
>> http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=305​0771
>>
>> To unsubscribe from this discussion, e-mail: [
>> users-unsubscribe@su​bclipse.tigris.org].​
>>
>
>
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
>


--
Thanks

Mark Phippard
http://markphip.blogspot.com/
Attachments

RE: [Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2013-03-11 07:53:23 PDT
Message I just merged a change that changes two files in the project (different subfolder).
In the Synchronize view the project is shown, with two subfolder and one file in each.
I right clicket he top item (the project) and selected Commit...
The Commit dialog shows these items under Changes:
 - project_x/folder1/folder11
 -- file1
 - project_x/folder2/folder22
 -- file2

The green triangle item for the project is missing.

TSVN confirms that the project folder has changed properties.

I commit (in subclipse).

I recheck with TSVN and it still shows the proprties changed and uncommited.

Then in subclipse I do Sync with repository.
Now the project folder is marked as conflicted (red double arrow).
I do an Update on it.

Now finally it shows the green triangle* in the commit dialog. (but not on the Synchronize view, there the icon has just the gray right arrow).
I still don't see a way to show the changes (of the property).

* it is actually a white triangle inside a green square


PS: TSVN is of course TortoiseSVN

David Balažic
Software Engineer
www.comtrade.com



____________________​____________
From: Mark Phippard [mailto:markphip at gmail dot com]
Sent: Monday, March 11, 2013 3:24 PM
To: users at subclipse dot tigris dot org
Subject: Re: [Subclipse-users] Merge info not commited?
Importance: Low

Mergeinfo is just a property and we show those and text changes in the UI. Subversion itself is responsible for reporting this information and doing the actual commit.

Keep in mind that everything is going to be scoped to your selection. So if you do not select the project when you take a commit option it is not going to be included in the dialog or the commit itself. For example, if you just selected the package or files that had changes, the mergeinfo recorded on the project would not go with it. TortoiseSVN and the SVN command line would behave the same if you drilled down to one of those folders and did the commit.



On Mon, Mar 11, 2013 at 10:20 AM, David Balažic <david.balazic@co​mtrade.com<mailto​:david.balazic@comtr​ade.com>> wrote:
Hi!

When I do a merge and commit the result, sometimes the merge info (svn:mergeinfo property on the root folder) is not commited.
In the commit dialog there should be an entry for this folder with a small greem triangle on it.
But sometimes this is missing.
If I check the files (of the working copy) with another client (TSVN 1.7.11), I see that the top folder has the uncommited change (the mentioned svn:mergeinfo property).
Also if I commit what the dialog offers, the property change stays uncommited.

Looks like a bug?

On a related note, when there is such an uncommited change (of file properties, usually on a folder), subclipse shows the folder as modified, but doubleclicking on it shows nothing.
It seems weird, as the GUI lists the object in the list of changed files, but does not say what is changed. It looks like a bug.


Version info:

Windows 7 Pro SP1 64 bit

Eclipse Java EE IDE for Web Developers.

Version: Indigo Service Release 2
Build id: 20120216-1857


  Subclipse (Required) 1.8.18 org.tigris.subversio​n.subclipse.feature.​group tigris.org<http://tigris.org>

Regards,
David
David Balažic
Software Engineer

    ComTrade

    Letališka cesta 29b, 1000 Ljubljana
    Slovenia

    phone: +386 81 60 8937<tel:%2B386%2​081%2060%208937>
    fax: +386 1 586 52 70<tel:%2B386%201​%20586%2052%2070>​

www.comtrade.com<http://www.comtrade.com>

--------------------​--------------------​--------------
http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=305​0771

To unsubscribe from this discussion, e-mail: [users-unsubscribe@s​ubclipse.tigris.org​<mailto:users-unsu​bscribe at subclipse dot ti​gris.org>].



--
Thanks

Mark Phippard
http://markphip.blogspot.com/
Attachments

Re: [Subclipse-users] Merge info not commited?

Author markphip
Full name Mark Phippard
Date 2013-03-11 07:24:05 PDT
Message Mergeinfo is just a property and we show those and text changes in the UI.
 Subversion itself is responsible for reporting this information and doing
the actual commit.

Keep in mind that everything is going to be scoped to your selection. So
if you do not select the project when you take a commit option it is not
going to be included in the dialog or the commit itself. For example, if
you just selected the package or files that had changes, the mergeinfo
recorded on the project would not go with it. TortoiseSVN and the SVN
command line would behave the same if you drilled down to one of those
folders and did the commit.



On Mon, Mar 11, 2013 at 10:20 AM, David Balažic
<david.balazic@co​mtrade.com>wrote:​

> Hi!
>
> When I do a merge and commit the result, sometimes the merge info
> (svn:mergeinfo property on the root folder) is not commited.
> In the commit dialog there should be an entry for this folder with a small
> greem triangle on it.
> But sometimes this is missing.
> If I check the files (of the working copy) with another client (TSVN
> 1.7.11), I see that the top folder has the uncommited change (the mentioned
> svn:mergeinfo property).
> Also if I commit what the dialog offers, the property change stays
> uncommited.
>
> Looks like a bug?
>
> On a related note, when there is such an uncommited change (of file
> properties, usually on a folder), subclipse shows the folder as modified,
> but doubleclicking on it shows nothing.
> It seems weird, as the GUI lists the object in the list of changed files,
> but does not say what is changed. It looks like a bug.
>
>
> Version info:
>
> Windows 7 Pro SP1 64 bit
>
> Eclipse Java EE IDE for Web Developers.
>
> Version: Indigo Service Release 2
> Build id: 20120216-1857
>
>
> Subclipse (Required) 1.8.18
> org.tigris.subversio​n.subclipse.feature.​group tigris.org
>
> Regards,
> David
> David Balažic
> Software Engineer
>
> ComTrade
>
> Letališka cesta 29b, 1000 Ljubljana
> Slovenia
>
> phone: +386 81 60 8937
> fax: +386 1 586 52 70
>
> www.comtrade.com
>
> --------------------​--------------------​--------------
>
> http://subclipse.tig​ris.org/ds/viewMessa​ge.do?dsForumId=1047​&dsMessageId=305​0771
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe@su​bclipse.tigris.org].​
>



--
Thanks

Mark Phippard
http://markphip.blogspot.com/
Attachments

[Subclipse-users] Merge info not commited?

Author David Balažic <david dot balazic at comtrade dot com>
Full name David Balažic <david dot balazic at comtrade dot com>
Date 2013-03-11 07:20:32 PDT
Message Hi!

When I do a merge and commit the result, sometimes the merge info (svn:mergeinfo property on the root folder) is not commited.
In the commit dialog there should be an entry for this folder with a small greem triangle on it.
But sometimes this is missing.
If I check the files (of the working copy) with another client (TSVN 1.7.11), I see that the top folder has the uncommited change (the mentioned svn:mergeinfo property).
Also if I commit what the dialog offers, the property change stays uncommited.

Looks like a bug?

On a related note, when there is such an uncommited change (of file properties, usually on a folder), subclipse shows the folder as modified, but doubleclicking on it shows nothing.
It seems weird, as the GUI lists the object in the list of changed files, but does not say what is changed. It looks like a bug.


Version info:

Windows 7 Pro SP1 64 bit

Eclipse Java EE IDE for Web Developers.

Version: Indigo Service Release 2
Build id: 20120216-1857


  Subclipse (Required) 1.8.18 org.tigris.subversio​n.subclipse.feature.​group tigris.org

Regards,
David
David Balažic
Software Engineer

    ComTrade

    Letališka cesta 29b, 1000 Ljubljana
    Slovenia

    phone: +386 81 60 8937
    fax: +386 1 586 52 70

www.comtrade.com
Messages per page: