kipi-plugins 2.0 branch merged

[Marcel Wiesweg]

Hi,

the "2.0" branch of kipi-plugins has been merged to master,
heading for KDE 4.7.
In your local repositories, checkout master, pull, delete your local 2.0
branch, and cleanup:
git checkout master
git pull
git branch -d 2.0
git remote prune origin
(assuming you have no local commits. If you have, rebase or cherry-pick)

Marcel
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[sean darcy]

On 03/01/2011 03:51 PM, Marcel Wiesweg wrote:

> Hi,
>
> the "2.0" branch of kipi-plugins has been merged to master,
> heading for KDE 4.7.
> In your local repositories, checkout master, pull, delete your local 2.0
> branch, and cleanup:
> git checkout master
> git pull
> git branch -d 2.0
> git remote prune origin
> (assuming you have no local commits. If you have, rebase or cherry-pick)
>
> Marcel

I'm sorry to be so clueless, but:

git clone
git:kde:digikam-software-compilation digikam-sc.2

./download-repos
Cloning into core...

[video@sixcore digikam-sc.2]$ git checkout master
Already on 'master'
[video@sixcore digikam-sc.2]$ git pull
remote: Counting objects: 35, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 30 (delta 15), reused 0 (delta 0)
Unpacking objects: 100% (30/30), done.
 From git://anongit.kde.org/digikam-software-compilation
    12d0b91..b62f395  master     -> origin/master
Updating 12d0b91..b62f395
Fast-forward
  .gitslave                     |    3 +
  CMakeLists.txt                |   10 ++-
  cmake/modules/FindKSane.cmake |  156
+++++++++++++++++++++++++++++++++++++++++
  doc/CMakeLists.txt            |   27 +++++++
  download-repos                |    5 +-
  extra/CMakeLists.txt          |    1 +
  6 files changed, 196 insertions(+), 6 deletions(-)
  create mode 100644 cmake/modules/FindKSane.cmake
  create mode 100644 doc/CMakeLists.txt
[video@sixcore digikam-sc.2]$ git branch -d 2.0
error: branch '2.0' not found.


sean


_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[kunal ghosh]

[video@sixcore digikam-sc.2]$ git branch -d 2.0
error: branch '2.0' not found.

Hi Sean,
This is because there is no branch 2.0 to be deleted (git branch -d is to delete a branch).
can you please run
$git branch -a
this will show all available branches.

Marcel's post was for those who already had a working copy. fresh clones contain the
necessary changes made already.
 

sean


_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

--
regards
-------
Kunal Ghosh
Dept of Computer Sc. & Engineering.
Sir MVIT
Bangalore,India

permalink: member.acm.org/~kunal.t2

Blog:kunalghosh.wordpress.com
Website:www.kunalghosh.net46.net

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Matthias Welwarsky-2]

On Tuesday 01 March 2011 21:51:45 Marcel Wiesweg wrote:

> Hi,
>
> the "2.0" branch of kipi-plugins has been merged to master,
> heading for KDE 4.7.
> In your local repositories, checkout master, pull, delete your local 2.0
> branch, and cleanup:
> git checkout master
> git pull
> git branch -d 2.0
> git remote prune origin
> (assuming you have no local commits. If you have, rebase or cherry-pick)

Hello Marcel,

thanks for the notice. I tried syncing my local stuff yesterday night and
noticed that I could not pull into my 2.0 any more. So we're now on "master",
that's fine. Are there more transitions to be expected soon or are we done for
now?

regards,
matthias

_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-4]

2011/3/2 Matthias Welwarsky <[hidden email]>:

> On Tuesday 01 March 2011 21:51:45 Marcel Wiesweg wrote:
>> Hi,
>>
>> the "2.0" branch of kipi-plugins has been merged to master,
>> heading for KDE 4.7.
>> In your local repositories, checkout master, pull, delete your local 2.0
>> branch, and cleanup:
>> git checkout master
>> git pull
>> git branch -d 2.0
>> git remote prune origin
>> (assuming you have no local commits. If you have, rebase or cherry-pick)
>
> Hello Marcel,
>
> thanks for the notice. I tried syncing my local stuff yesterday night and
> noticed that I could not pull into my 2.0 any more. So we're now on "master",
> that's fine. Are there more transitions to be expected soon or are we done for
> now?
>
> regards,
> matthias

digiKam still to be merged from 2.0 to master

Gilles Caulier
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel