Re: Merge info not commited?

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
<[email protected]>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:[email protected]]
> *Sent:* Monday, March 11, 2013 3:24 PM
> *To:* [email protected]
> *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 <
> [email protected]> 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.subversion.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.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3050771
>>
>> To unsubscribe from this discussion, e-mail: [
>> [email protected]].
>>
>
>
>
>  --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
>


-- 
Thanks

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

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3050778

To unsubscribe from this discussion, e-mail: [[email protected]].