Thank you,

It worked with

git checkout upstream/dspace-6_x

Best regards
Evgeni

On Friday, August 10, 2018 at 3:08:26 PM UTC+3, helix84 wrote:
>
> Are you following the guide we wrote? This chapter talks about how to set 
> up a tracking branch:
>
>
> https://wiki.duraspace.org/display/DSPACE/Development+with+Git#DevelopmentwithGit-Option2-%22cherry-pick%22changesfrommastertoreleasebranch
>
> That's how you get a branch from upstream repo into your local repo.
>
>
> Regards,
> ~~helix84
>
> Compulsory reading: DSpace Mailing List Etiquette
> https://wiki.duraspace.org/display/DSPACE/Mailing+List+Etiquette
>
> On Fri, Aug 10, 2018 at 1:56 PM Evgeni Dimitrov <dimitr...@gmail.com 
> <javascript:>> wrote:
>
>> Thank you helix84,
>>
>> When I did in the beginning
>>
>> >git remote add upstream git://github.com/DSpace/DSpace.git
>> >git fetch upstream
>> I got:
>>
>> remote: Counting objects: 287, done.
>> remote: Compressing objects: 100% (7/7), done.
>> Rremote: Total 287 (delta 113), reused 126 (delta 113), pack-reused 160
>> Receiving objects: 100% (287/287), 38.74 KiB | 0 bytes/s, done.
>> Resolving deltas: 100% (128/128), completed with 37 local objects.
>> From git://github.com/DSpace/DSpace
>>  * [new branch]      dspace-1_2_2-patches -> upstream/dspace-1_2_2-patches
>>  * [new branch]      dspace-1_2_2-update -> upstream/dspace-1_2_2-update
>>  * [new branch]      dspace-1_4_x -> upstream/dspace-1_4_x
>>  * [new branch]      dspace-1_5_x -> upstream/dspace-1_5_x
>>  * [new branch]      dspace-1_6_x -> upstream/dspace-1_6_x
>>  * [new branch]      dspace-1_7_x -> upstream/dspace-1_7_x
>>  * [new branch]      dspace-1_8_x -> upstream/dspace-1_8_x
>>  * [new branch]      dspace-3_x -> upstream/dspace-3_x
>>  * [new branch]      dspace-4_x -> upstream/dspace-4_x
>>  * [new branch]      dspace-5_x -> upstream/dspace-5_x
>>  * [new branch]      dspace-6_x -> upstream/dspace-6_x
>>  * [new branch]      master     -> upstream/master
>>  * [new branch]      rest-tutorial -> upstream/rest-tutorial
>>
>> But now I get:
>>
>> D:\ADISK5\dspace-src>git checkout dspace-6_x
>> error: pathspec 'dspace-6_x' did not match any file(s) known to git.
>>
>>
>>
>> On Friday, August 10, 2018 at 1:33:14 PM UTC+3, helix84 wrote:
>>>
>>> # first switch to the dspace 6 branch:
>>> git checkout dspace-6_x
>>> # then create a new identical branch as the current one and name it 
>>> DS-3974
>>> git checkout -b DS-3974
>>>
>>>
>>> git remote add upstream git://github.com/DSpace/DSpace.git
>>> # this was a one-time operation which allows you to pull latest changes 
>>> from the official DSpace repo to your local repo:
>>> git pull upstream
>>> # which is identical to
>>> git fetch upstream
>>> git merge upstream
>>>
>>>
>>> Regards,
>>> ~~helix84
>>>
>>> Compulsory reading: DSpace Mailing List Etiquette
>>> https://wiki.duraspace.org/display/DSPACE/Mailing+List+Etiquette
>>>
>>> On Fri, Aug 10, 2018 at 10:17 AM Evgeni Dimitrov <dimitr...@gmail.com> 
>>> wrote:
>>>
>>>> I want to propose a fix to an issue.
>>>>
>>>> What I did:
>>>>
>>>> 1. I did Fork in https://github.com/DSpace/DSpace
>>>>
>>>> 2. I did clone to my machine:
>>>> git clone git://github.com/xxxxxx/DSpace.git dspace-src
>>>>
>>>> 3. I did (don't know why):
>>>> git remote add upstream git://github.com/DSpace/DSpace.git
>>>> git fetch upstream
>>>>
>>>> What I am trying now is to create a branch for the issue. The issue is 
>>>> in DSpace 6.3 and I suppose my branch should be a subbranch of dspace-6_x:
>>>>
>>>> D:\ADISK5\dspace-src>git checkout -b DS-3974 dspace-6_x
>>>> fatal: Cannot update paths and switch to branch 'DS-3974' at the same 
>>>> time.
>>>> Did you intend to checkout 'dspace-6_x' which can not be resolved as 
>>>> commit?
>>>>
>>>> D:\ADISK5\dspace-src>git branch DS-3974 dspace-6_x
>>>> fatal: Not a valid object name: 'dspace-6_x'.
>>>>
>>>> What branch should I create and how?
>>>>
>>>> -- 
>>>> All messages to this mailing list should adhere to the DuraSpace Code 
>>>> of Conduct: https://duraspace.org/about/policies/code-of-conduct/
>>>> --- 
>>>> You received this message because you are subscribed to the Google 
>>>> Groups "DSpace Technical Support" group.
>>>> To unsubscribe from this group and stop receiving emails from it, send 
>>>> an email to dspace-tech...@googlegroups.com.
>>>> To post to this group, send email to dspac...@googlegroups.com.
>>>> Visit this group at https://groups.google.com/group/dspace-tech.
>>>> For more options, visit https://groups.google.com/d/optout.
>>>>
>>> -- 
>> All messages to this mailing list should adhere to the DuraSpace Code of 
>> Conduct: https://duraspace.org/about/policies/code-of-conduct/
>> --- 
>> You received this message because you are subscribed to the Google Groups 
>> "DSpace Technical Support" group.
>> To unsubscribe from this group and stop receiving emails from it, send an 
>> email to dspace-tech...@googlegroups.com <javascript:>.
>> To post to this group, send email to dspac...@googlegroups.com 
>> <javascript:>.
>> Visit this group at https://groups.google.com/group/dspace-tech.
>> For more options, visit https://groups.google.com/d/optout.
>>
>

-- 
All messages to this mailing list should adhere to the DuraSpace Code of 
Conduct: https://duraspace.org/about/policies/code-of-conduct/
--- 
You received this message because you are subscribed to the Google Groups 
"DSpace Technical Support" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to dspace-tech+unsubscr...@googlegroups.com.
To post to this group, send email to dspace-tech@googlegroups.com.
Visit this group at https://groups.google.com/group/dspace-tech.
For more options, visit https://groups.google.com/d/optout.

Reply via email to