Login | Register
My pages Projects Community openCollabNet

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

subclipse
Discussion topic

Back to topic list

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

« Previous message in topic | 2 of 11 | Next message in topic »

Messages

Show all messages in topic

[Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2013-03-11 07:20:32 PDT
     Re: [Subclipse-users] Merge info not commited? markphip Mark Phippard 2013-03-11 07:24:05 PDT
         RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2013-03-11 07:53:23 PDT
             Re: [Subclipse-users] Merge info not commited? markphip Mark Phippard 2013-03-11 08:02:15 PDT
                 RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2013-03-11 08:27:08 PDT
                     RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2014-06-11 05:36:33 PDT
                         Re: [Subclipse-users] Merge info not commited? selsemore Stephen Elsemore 2014-06-11 14:14:50 PDT
                             RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2014-06-12 02:45:55 PDT
                             RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2014-12-09 10:58:52 PST
                                 RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2014-12-09 11:07:04 PST
                 RE: [Subclipse-users] Merge info not commited? David Balažic <david dot balazic at comtrade dot com> David Balažic <david dot balazic at comtrade dot com> 2013-03-11 08:37:42 PDT
Messages per page: